mirror of
https://github.com/kuhyx/signal-bot.git
synced 2026-11-10 19:37:03 +01:00
The bot did not work. `run.sh` started a FastAPI app whose
`@app.on_event("startup")` awaited `asyncio.gather()` on two infinite
tasks, so uvicorn never finished starting up and no HTTP was ever served;
the readme's `python main.py` was a no-op with no `__main__` block and no
`uvicorn.run()` call. All three CI workflows were red, one referencing an
`environment.yml` that does not exist.
Rewritten as a package behind an injectable transport seam, which is what
makes the offline environment possible.
Bugs fixed:
- startup deadlock: lifespan spawns the loops instead of awaiting them
- sticker filter read dataMessage.sticker even on syncMessage envelopes, so
the account's own stickers were never filtered (e038772, 53028cc, 07fa90d,
2416cef all fought this symptom)
- no websocket reconnect: a container restart killed the bot silently
- blocking `requests` inside async functions stalled the event loop
- every counted message DMed the whole tally to the bot itself
- images were written to CWD under a filename taken from the remote URL
- one global 10s cooldown shared across all users and commands
- dead code: RECEIVE_URL, get_attachments (no call site), USER_MESSAGE_COUNT
- .env.sample declared PRIMARY/SECONDARY_PHONE_NUMBER and MODE, none read
Scoping is now an enforced invariant. A linked device receives every DM and
every group on the account; GROUP_ID was the only thing narrowing that and
defaulted to "". Config refuses to start unscoped, direct messages are
dropped explicitly rather than by a falsy check, and a scenario asserts that
DMs and other groups produce zero outbound messages.
Offline environment: fake_signal/ serves the real protocol surface, so the
unmodified bot connects to it by pointing API_BASE_URL at it. scripts/e2e.sh
boots both, replays 7 scenarios and exits non-zero on mismatch. A local
Signal server is not achievable (signal-cli compiles its endpoints and trust
store in; Signal-Server needs FoundationDB), so faking this boundary is the
only way to test every feature without an account.
Transport pinned to bbernhard/signal-cli-rest-api:0.100 with
MODE=json-rpc-native. The readme pinned 0.167-dev; the dev tag series counts
separately, so that was older than 0.100, not newer. /v1/receive is only a
WebSocket in a json-rpc mode, so the mode is verified at startup.
Repo standards: ruff select=ALL, mypy --strict, 189 tests at 100% branch
coverage, 250-line cap, exact pins at newest stable, shared gates delegated
to ~/utils, one CI workflow replacing three red ones. No noqa, no
type: ignore, no coverage omits anywhere.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013yaBT45KhHqxTKVCTA87iy
146 lines
5.4 KiB
Python
146 lines
5.4 KiB
Python
# Copyright (c) 2026 Krzysztof Rudnicki. MIT licence.
|
|
"""Transport adapter for bbernhard/signal-cli-rest-api.
|
|
|
|
Receive is a WebSocket, which the container only exposes when it runs in one
|
|
of the json-rpc modes; in normal/native mode the same path silently degrades
|
|
to a polling GET, so the mode is verified at startup rather than assumed.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import logging
|
|
from collections.abc import AsyncIterator, Awaitable, Callable
|
|
from typing import TYPE_CHECKING, Any, Final
|
|
|
|
from websockets.asyncio.client import connect as ws_connect
|
|
from websockets.exceptions import WebSocketException
|
|
|
|
if TYPE_CHECKING:
|
|
import httpx
|
|
|
|
from signal_bot.config import Config
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
INITIAL_BACKOFF: Final = 1.0
|
|
MAX_BACKOFF: Final = 30.0
|
|
BACKOFF_FACTOR: Final = 2.0
|
|
_OK_STATUSES: Final = frozenset({200, 201, 204})
|
|
|
|
Connector = Callable[[str], Any]
|
|
Sleeper = Callable[[float], Awaitable[None]]
|
|
|
|
|
|
class TransportError(RuntimeError):
|
|
"""Raised when the Signal REST API rejects a request."""
|
|
|
|
|
|
class RestTransport:
|
|
"""Talks to the signal-cli-rest-api container over REST plus a WebSocket."""
|
|
|
|
def __init__(
|
|
self,
|
|
config: Config,
|
|
client: httpx.AsyncClient,
|
|
*,
|
|
connector: Connector | None = None,
|
|
sleeper: Sleeper | None = None,
|
|
max_reconnects: int | None = None,
|
|
) -> None:
|
|
"""Wire the adapter to its config and its injectable I/O.
|
|
|
|
Args:
|
|
config: Resolved runtime configuration.
|
|
client: HTTP client used for every REST call.
|
|
connector: WebSocket connect callable. Injected by the tests.
|
|
sleeper: Async sleep used for reconnect backoff.
|
|
max_reconnects: Stop after this many reconnects. None means forever.
|
|
"""
|
|
self._config = config
|
|
self._client = client
|
|
self._connect = connector if connector is not None else ws_connect
|
|
self._sleep = sleeper if sleeper is not None else asyncio.sleep
|
|
self._max_reconnects = max_reconnects
|
|
|
|
async def verify_mode(self) -> str:
|
|
"""Return the container's mode, raising unless it exposes a WebSocket.
|
|
|
|
Raises:
|
|
TransportError: The container is not running a json-rpc mode.
|
|
"""
|
|
response = await self._client.get(self._config.about_url)
|
|
response.raise_for_status()
|
|
body = response.json()
|
|
mode = str(body.get("mode", "")) if isinstance(body, dict) else ""
|
|
if "json-rpc" not in mode:
|
|
msg = (
|
|
f"signal-cli-rest-api is running in mode {mode!r}; the receive "
|
|
"endpoint is only a WebSocket in a json-rpc mode. Start the "
|
|
"container with MODE=json-rpc-native."
|
|
)
|
|
raise TransportError(msg)
|
|
return mode
|
|
|
|
async def receive(self) -> AsyncIterator[str]:
|
|
"""Yield raw envelope frames, reconnecting with backoff when dropped."""
|
|
backoff = INITIAL_BACKOFF
|
|
reconnects = 0
|
|
while True:
|
|
try:
|
|
async with self._connect(self._config.receive_url) as socket:
|
|
backoff = INITIAL_BACKOFF
|
|
async for frame in socket:
|
|
yield frame if isinstance(frame, str) else frame.decode()
|
|
except (WebSocketException, OSError) as exc:
|
|
logger.warning("signal websocket dropped: %s", exc)
|
|
if self._max_reconnects is not None and reconnects >= self._max_reconnects:
|
|
return
|
|
reconnects += 1
|
|
await self._sleep(backoff)
|
|
backoff = min(backoff * BACKOFF_FACTOR, MAX_BACKOFF)
|
|
|
|
async def _post_send(self, payload: dict[str, Any]) -> None:
|
|
"""POST one send payload and raise unless the API accepted it."""
|
|
response = await self._client.post(self._config.send_url, json=payload)
|
|
if response.status_code not in _OK_STATUSES:
|
|
msg = f"send failed with HTTP {response.status_code}: {response.text}"
|
|
raise TransportError(msg)
|
|
|
|
async def send_text(self, text: str, recipient: str) -> None:
|
|
"""Send a plain-text message to a group id or phone number."""
|
|
await self._post_send(
|
|
{
|
|
"message": text,
|
|
"number": self._config.phone_number,
|
|
"recipients": [recipient],
|
|
}
|
|
)
|
|
|
|
async def send_image(self, image_base64: str, recipient: str) -> None:
|
|
"""Send a base64-encoded image attachment to a recipient."""
|
|
await self._post_send(
|
|
{
|
|
"message": "",
|
|
"base64_attachments": [image_base64],
|
|
"number": self._config.phone_number,
|
|
"recipients": [recipient],
|
|
}
|
|
)
|
|
|
|
async def list_attachments(self) -> list[str]:
|
|
"""Return the ids of attachments stored server-side."""
|
|
response = await self._client.get(self._config.attachments_url)
|
|
response.raise_for_status()
|
|
body = response.json()
|
|
if not isinstance(body, list):
|
|
return []
|
|
return [str(item) for item in body]
|
|
|
|
async def delete_attachment(self, attachment_id: str) -> None:
|
|
"""Delete one stored attachment by id."""
|
|
response = await self._client.delete(f"{self._config.attachments_url}/{attachment_id}")
|
|
if response.status_code not in _OK_STATUSES:
|
|
msg = f"attachment delete failed with HTTP {response.status_code}"
|
|
raise TransportError(msg)
|