mirror of
https://github.com/openswarm-ai/openswarm.git
synced 2026-09-28 20:44:50 +02:00
* [eric] ci: gitleaks-ignore the known historical secrets so our branch stops failing on leaks it didnt add * [eric] workflows: restore scheduled-tasks on the workflow line (revert removal, keep windows fixes + 1.1.69) * [eric] workflows: re-apply uncommitted scheduling wip (schedule pill, calendar view, slice) * [eric] ops: gitignore dev-team local state files * [eric] ops: backlog item for download-tracking visibility * [eric] ci: allowlist the cdp-routes redaction-test token in gitleaks * [aidan] feat/scheduled-tasks: keep step labels in sync on edit and show chevron on every step * [aidan] fix: schedule time in chat * [aidan] ux/workflows: add workflow step removal (#91) * [aidan] feat/scheduled-tasks: remember workflow tool permissions across runs * [aidan] feat/task-scheduling: add hourly and minute (15-min minimum) schedule intervals (#93) * [aidan] feat/scheduled-tasks: calendar, rename, and edit workflows (#94) * [aidan] bug: fix schedule button * [aidan] fix/agent-errors: surface provider rate limits * [aidan] ux/cards: click-to-rename for chat and workflow titles Single-click a card's title to enter edit mode inline. Commit on Enter/blur, cancel on Escape. Rename persists via PATCH for workflows and sessions. * [aidan] feat/workflows: seed build prompt for zero-step workflows When a new workflow has no steps, seed the agent with a prompt asking the user to describe what the workflow should do, rather than starting blank. * [aidan] feat/workflows: add-to-schedule popover for unscheduled workflows Clicking the "+" on an unscheduled workflow row opens a popover with two options: - Keep this schedule: enables the workflow's existing cadence and moves it to Scheduled - Change schedule: opens the scheduling editor to pick a different time * [aidan] ux/workflows: wire add-to-schedule popover and simplify New button - Made the "+" icon on unscheduled workflow rows clickable, opening a popover to keep or change the schedule - Removed AddIcon from toolbar "New" button (now reads "New" instead of "+ New") * [aidan] fix/scheduled-tasks: open schedule calendar when Schedule pill clicked Fixed the Schedule pill click being swallowed by the toolbar's dismiss handler. Exempted the toolbar pills via data-toolbar-pills so their click handlers fire. * [aidan] ux/workflows: open New workflow in agent build chat instead of empty card When creating a new workflow from the hub, open it in edit_agent view (with the agent builder chat) instead of a preview card. The workflow is created on the backend first so the embedded session has a real ID. * [aidan] feat/workflow-edit: add draft testing save flow * [aidan] ux/chat: remove continue chat button * [aidan] ux/workflows: polish workflow card interactions * [aidan] fix/workflow-scheduling: save unscheduled workflows as drafts * aidan ui: schedule naming changes * [aidan] ui: tool calling desc/naming * [aidan] ui: calendar sidebar naming * [aidan] ui: fix stop viewing closing chat * [aidan] feat/workflows: auto-name workflows and polish the build flow (#95) * [aidan] feat/workflow-auto-naming: auto-generate workflow titles from steps Generate a title + description from a workflow's steps (one aux call, reused for step labels) whenever it is still auto_named, so a workflow built in the Edit Agent names itself on commit instead of staying "New workflow". A manual rename sets auto_named=False and is never overwritten. Stream the aux call (non-streaming drops content on some 9router lanes) and fall back to a step-derived title when the model is unavailable. * [aidan] feat/workflows: hide unsaved new workflows until first save A brand-new "+ New" workflow is created with unsaved=true and kept out of the hub's scheduled/unscheduled lists while the user is still building it in the Edit Agent. The first commit (Save) clears the flag and the workflow appears. Every other create path stays visible immediately. * [aidan] ux/workflows: remove redundant save workflow button The Edit Agent already has Discard/Save controls in its strip, so the header "Save Workflow" button was a duplicate save path. Remove it and its pulse/edit-session-id wiring; the model/time subtitle stays. * [aidan] ux/workflows: animate title on auto-rename Wrap the workflow card title in the same Typewriter the chat card uses, so when the auto-generated name replaces the placeholder after Save it retypes letter-by-letter. Gated on a real (non-placeholder) title so it never animates on mount or for already-named workflows. * [aidan] ux/workflows: animate sidebar title on auto-rename Wrap the calendar hub's sidebar row title in the same Typewriter the workflow card uses, so a title that auto-renames retypes letter-by-letter in the sidebar too. Extract the placeholder/isRealTitle guard into the shared workflowVisuals so the card and sidebar stay in sync. * [aidan] fix/workflows: connect watch tether, keep watched chat open, wire draft run/history * [aidan] ui: grey out chat pill when not selected * [aidan] ui: fix running agent display * [aidan] feat/history-popover: add chat history and scheduled tasks run log tabs (#96) * [aidan] ux/schedule: toast when calendar view already open on expand * [aidan] ui: fix popover descs * [aidan] feat/workflow-runs: add pause, resume, and stop controls for live runs * [aidan] feat/schedule-calendar: add calendar occurrences endpoint and concrete timezones * [aidan] feat/workflows: require at least one step to save a workflow * [aidan] ux/edit-agent: hide Discard for an unsaved new workflow * [aidan] ux/edit-agent: move fix-prefix card below the step list * [aidan] feat/workflows: toast when an unattended scheduled run starts * [aidan] fix/dashboard-tethers: anchor workflow-sidecar tethers to measured card rects * [aidan] feat/workflows: validate steps before scheduling and keep chat tool memory * [aidan] feat/mcp-suggestions: dismissable integration banner with per-session cooldown * [aidan] feat/workflows: add scheduled-run "running now" toast with click-to-view (#97) * [aidan] ux/workflows: surface paused state on card, sidebar, and calendar; tidy run history * [aidan] feat/mcp-suggestions: suggest both Google and Microsoft when provider is ambiguous * [aidan] fix/agent-tokens: friendly out-of-tokens card across all agent surfaces * [aidan] feat/workflow-model: persist edit-agent model on save with switch notice and fresh drafts * [aidan] fix/workflow-chat: force stop on watched run mirrors workflow card stop * [aidan] fix/workflow-cards: keep watched run tethered on finish to avoid duplicate chat * [aidan] feat/schedule-calendar: mark current time with a now line in week view * [aidan] refactor/private-names: rename error and schedule classifiers from _ to p_ * [aidan] feat/scheduled-tasks: agent workflow scheduling and in-chat convert (#98) * [aidan] feat/workflow-suggest: nudge user to convert repeatable chat to workflow Add SuggestConvertToWorkflow MCP tool that agents call at the end of a task when they've completed something worth repeating (daily report, weekly check, recurring data pull). Frontend detects the tool call and glows the "Convert to workflow" button 3 times to draw the eye. When user clicks it, the suggested cadence (e.g. "every weekday at 9am") is stored in the draft and seeded into the scheduling agent's first prompt, so the agent can act on the suggestion rather than asking the user again. Tool is never auto-called — agents decide when a task is genuinely repeatable (not debugging, creative work, one-off lookup). Tool description emphasizes sparse, high-confidence use only (once per session max). Files changed: - backend/apps/agents/schedule_mcp_server.py: add SuggestConvertToWorkflow tool - frontend/src/shared/mcpToolMeta.ts: add label for new tool - frontend/src/app/pages/Dashboard/cards/AgentCard.tsx: detect suggestion in session messages, show+glow "Convert to workflow" button, pass cadence to draft - frontend/src/shared/state/workflowsSlice.ts: add suggested_cadence field to Workflow interface - frontend/src/app/pages/Workflows/SchedulingView.tsx: seed scheduling agent prompt with suggested cadence hint * [aidan] feat/agent-scheduling: route recurring asks through native workflows, deny claude cron skill * [aidan] feat/workflow-convert: in-chat convert popup and auto-open scheduled workflow card * [aidan] ux/calendar-page: schedule calendar restyle + popover fixes (#99) * [aidan] fix/dashboard-delete: remove workflows calendar panel on delete key * [aidan] ux/workflows-calendar: restyle hub, fix today highlight, add toolbar toggle * [aidan] ux/schedule-popover: compact density, fix sticky header bleed, add header spacing * [aidan] ux/schedule-calendar: hollow ring dot for past fires in month view * [aidan] ux/schedule-calendar: clickable +N more opens day's full run list * [aidan] feat/run-log-filters: add success and skipped pills to scheduled task history * [aidan] fix/convert-button: stop drag capture so convert-to-workflow click fires * [aidan] ux/calendar-card: match border color and radius to chat and workflow cards * [aidan] fix/minimap: render missed-runs card on the minimap * [aidan] ux/run-sparkline: simplify tooltip to plain run tally * [aidan] ux/run-history: collapse expanded run view to one clickable line * [aidan] ux/calendar-card: match corner radius to browser cards * [aidan] feat/workflows: launch-time scheduling UX and workflow-card polish (#101) * [aidan] feat/schedule-list: lazy-load list view via scroll sentinel * [aidan] feat/missed-runs: launch toast with per-workflow counts and pan-to-card * [aidan] fix/dashboard-tethers: keep watching line anchored on canvas zoom * [aidan] feat/scheduled-tasks: review missed runs at launch instead of auto-firing on_missed * [aidan] refactor/workflow-cards: use radius and status design tokens, polish card chrome * [aidan] ux/agent-card: keep convert-to-workflow visible during runs with mid-turn toast * [aidan] ux/mcp-bubble: drop redundant verb label when a workflow label is shown * [aidan] chore/backend: remove stale explanatory comments * [aidan] fix/workflows-hub: load workflows on hub mount so calendar fills at launch * [aidan] feat/workflows: generate title, description, step labels at convert time * [aidan] fix/tidy-layout: include workflows hub in tidy and fit-to-view * [aidan] feat/schedule-list: window long list via measured-height virtualizer * [aidan] ux/workflows-hub: remove time-saved badge from calendar header * [aidan] fix/types: add missing semantic-type labels and drop stray fade arg * [aidan] feat/schedule: pin monthly day-of-month and honor repeat-every intervals * [aidan] feat/schedule: inherit source-session tool surface for scheduled runs * [aidan] ux/calendar: restack hour-cell events as bars with overflow affordance * [aidan] feat/calendar: open the run card when clicking a scheduled occurrence * [aidan] ux/missed-runs: add per-group select-all toggle and rename skip action * [aidan] feat: new scheduled task design ported * [aidan] ui: sidebar reorder, repeat controls on schedule card * [aidan] ui: sidebar, scheduling time * [aidan] feat/schedule: pin monthly last-day-of-month * [aidan] feat/steps: per-step enable toggle * [aidan] feat/workflows: per-workflow color swatch * [aidan] feat/trash: soft-delete workflows with restore and purge * [aidan] feat/run-monitor: live run monitor card on the canvas * [aidan] feat/run-context: attach a run as removable chat context * [aidan] feat/compose: new-workflow landing page and auto-commit build flow * [aidan] ui/workflows: dark mode and design-system cohesion * [aidan] ui/calendar: overflow popover, condensed week view, scroll fix * [aidan] feat/home: ongoing runs, missed review, and accurate Coming-up counts * [aidan] fix/run-status: sync ongoing runs and heal stuck/interrupted runs * [aidan] ux/schedule: last-day-of-month UI, Run-at time typing, interval input * [aidan] ux/workflows: default window size and toolbar icon * [aidan] fix/schedule: measure ran_late from start and anchor recurrences to created_at * [aidan] feat/calendar: render fire times from backend, drop JS recurrence reimpl * [aidan] chore/dashboard: drop dead configure/missed-run cards, refetch on reconnect * [aidan] chore/agent-card: remove unreachable convert-to-workflow action * [aidan] fix/workflows: don't bump updated_at on a no-op draft commit so viewing a workflow doesn't reorder the sidebar * [aidan] feat/schedule: warn when scheduling a workflow that has no steps * [aidan] fix/selection-tool: never select the workflows app, and exit the tool on Escape without dropping selections * [aidan] ux/compose: diversify new-workflow starter prompts across personas * [aidan] ux/run-monitor: spawn the run card a bit farther right of the workflows app * [aidan] fix/schedule: harden run recovery and storage writes against crashes * [aidan] ux/compose: restyle new-workflow starters as a clean pill cluster with rich prompts * [aidan] fix/workflows: optimistically apply edits so the schedule banner updates instantly * [aidan] ui/workflows: three-tone surface depth so the window lifts off the canvas in both themes * [aidan] ui/workflows: close buttons turn red on hover, matching the chat card * [aidan] test/schedule: cover executor pipeline, storage durability, and recurrence gaps * [aidan] fix: remove package-lock json * [aidan] fix/workflows-compose: keep compose view until edit agent replies * [aidan] feat/workflows: auto-generate workflow + step titles with typewriter animation * [eric] deps: restore frontend/package-lock.json (PR #105 deletion broke npm ci) --------- Co-authored-by: Eric <ciregenz@berkeley.edu> Co-authored-by: cire <134991075+ciregenz@users.noreply.github.com>
634 lines
22 KiB
Python
634 lines
22 KiB
Python
from __future__ import annotations
|
|
|
|
import socket
|
|
import ssl as ssl_module
|
|
import threading
|
|
import warnings
|
|
from collections.abc import Sequence
|
|
from typing import Any, Callable, Literal, TypeVar, cast
|
|
|
|
from ..client import ClientProtocol
|
|
from ..datastructures import HeadersLike
|
|
from ..exceptions import InvalidProxyMessage, InvalidProxyStatus, ProxyError
|
|
from ..extensions.base import ClientExtensionFactory
|
|
from ..extensions.permessage_deflate import enable_client_permessage_deflate
|
|
from ..headers import validate_subprotocols
|
|
from ..http11 import USER_AGENT, Response
|
|
from ..protocol import CONNECTING, Event
|
|
from ..proxy import Proxy, get_proxy, parse_proxy, prepare_connect_request
|
|
from ..streams import StreamReader
|
|
from ..typing import BytesLike, LoggerLike, Origin, Subprotocol
|
|
from ..uri import WebSocketURI, parse_uri
|
|
from .connection import Connection
|
|
from .utils import Deadline
|
|
|
|
|
|
__all__ = ["connect", "unix_connect", "ClientConnection"]
|
|
|
|
|
|
class ClientConnection(Connection):
|
|
"""
|
|
:mod:`threading` implementation of a WebSocket client connection.
|
|
|
|
:class:`ClientConnection` provides :meth:`recv` and :meth:`send` methods for
|
|
receiving and sending messages.
|
|
|
|
It supports iteration to receive messages::
|
|
|
|
for message in websocket:
|
|
process(message)
|
|
|
|
The iterator exits normally when the connection is closed with code
|
|
1000 (OK) or 1001 (going away) or without a close code. It raises a
|
|
:exc:`~websockets.exceptions.ConnectionClosedError` when the connection is
|
|
closed with any other code.
|
|
|
|
The ``ping_interval``, ``ping_timeout``, ``close_timeout``, and
|
|
``max_queue`` arguments have the same meaning as in :func:`connect`.
|
|
|
|
Args:
|
|
socket: Socket connected to a WebSocket server.
|
|
protocol: Sans-I/O connection.
|
|
|
|
"""
|
|
|
|
def __init__(
|
|
self,
|
|
socket: socket.socket,
|
|
protocol: ClientProtocol,
|
|
*,
|
|
ping_interval: float | None = 20,
|
|
ping_timeout: float | None = 20,
|
|
close_timeout: float | None = 10,
|
|
max_queue: int | None | tuple[int | None, int | None] = 16,
|
|
) -> None:
|
|
self.protocol: ClientProtocol
|
|
self.response_rcvd = threading.Event()
|
|
super().__init__(
|
|
socket,
|
|
protocol,
|
|
ping_interval=ping_interval,
|
|
ping_timeout=ping_timeout,
|
|
close_timeout=close_timeout,
|
|
max_queue=max_queue,
|
|
)
|
|
|
|
def handshake(
|
|
self,
|
|
additional_headers: HeadersLike | None = None,
|
|
user_agent_header: str | None = USER_AGENT,
|
|
timeout: float | None = None,
|
|
) -> None:
|
|
"""
|
|
Perform the opening handshake.
|
|
|
|
"""
|
|
with self.send_context(expected_state=CONNECTING):
|
|
self.request = self.protocol.connect()
|
|
if additional_headers is not None:
|
|
self.request.headers.update(additional_headers)
|
|
if user_agent_header is not None:
|
|
self.request.headers.setdefault("User-Agent", user_agent_header)
|
|
self.protocol.send_request(self.request)
|
|
|
|
if not self.response_rcvd.wait(timeout):
|
|
raise TimeoutError("timed out while waiting for handshake response")
|
|
|
|
# self.protocol.handshake_exc is set when the connection is lost before
|
|
# receiving a response, when the response cannot be parsed, or when the
|
|
# response fails the handshake.
|
|
|
|
if self.protocol.handshake_exc is not None:
|
|
raise self.protocol.handshake_exc
|
|
|
|
def process_event(self, event: Event) -> None:
|
|
"""
|
|
Process one incoming event.
|
|
|
|
"""
|
|
# First event - handshake response.
|
|
if self.response is None:
|
|
assert isinstance(event, Response)
|
|
self.response = event
|
|
self.response_rcvd.set()
|
|
# Later events - frames.
|
|
else:
|
|
super().process_event(event)
|
|
|
|
def recv_events(self) -> None:
|
|
"""
|
|
Read incoming data from the socket and process events.
|
|
|
|
"""
|
|
try:
|
|
super().recv_events()
|
|
finally:
|
|
# If the connection is closed during the handshake, unblock it.
|
|
self.response_rcvd.set()
|
|
|
|
|
|
def connect(
|
|
uri: str,
|
|
*,
|
|
# TCP/TLS
|
|
sock: socket.socket | None = None,
|
|
ssl: ssl_module.SSLContext | None = None,
|
|
server_hostname: str | None = None,
|
|
# WebSocket
|
|
origin: Origin | None = None,
|
|
extensions: Sequence[ClientExtensionFactory] | None = None,
|
|
subprotocols: Sequence[Subprotocol] | None = None,
|
|
compression: str | None = "deflate",
|
|
# HTTP
|
|
additional_headers: HeadersLike | None = None,
|
|
user_agent_header: str | None = USER_AGENT,
|
|
proxy: str | Literal[True] | None = True,
|
|
proxy_ssl: ssl_module.SSLContext | None = None,
|
|
proxy_server_hostname: str | None = None,
|
|
# Timeouts
|
|
open_timeout: float | None = 10,
|
|
ping_interval: float | None = 20,
|
|
ping_timeout: float | None = 20,
|
|
close_timeout: float | None = 10,
|
|
# Limits
|
|
max_size: int | None | tuple[int | None, int | None] = 2**20,
|
|
max_queue: int | None | tuple[int | None, int | None] = 16,
|
|
# Logging
|
|
logger: LoggerLike | None = None,
|
|
# Escape hatch for advanced customization
|
|
create_connection: type[ClientConnection] | None = None,
|
|
**kwargs: Any,
|
|
) -> ClientConnection:
|
|
"""
|
|
Connect to the WebSocket server at ``uri``.
|
|
|
|
This function returns a :class:`ClientConnection` instance, which you can
|
|
use to send and receive messages.
|
|
|
|
:func:`connect` may be used as a context manager::
|
|
|
|
from websockets.sync.client import connect
|
|
|
|
with connect(...) as websocket:
|
|
...
|
|
|
|
The connection is closed automatically when exiting the context.
|
|
|
|
Args:
|
|
uri: URI of the WebSocket server.
|
|
sock: Preexisting TCP socket. ``sock`` overrides the host and port
|
|
from ``uri``. You may call :func:`socket.create_connection` to
|
|
create a suitable TCP socket.
|
|
ssl: Configuration for enabling TLS on the connection.
|
|
server_hostname: Host name for the TLS handshake. ``server_hostname``
|
|
overrides the host name from ``uri``.
|
|
origin: Value of the ``Origin`` header, for servers that require it.
|
|
extensions: List of supported extensions, in order in which they
|
|
should be negotiated and run.
|
|
subprotocols: List of supported subprotocols, in order of decreasing
|
|
preference.
|
|
compression: The "permessage-deflate" extension is enabled by default.
|
|
Set ``compression`` to :obj:`None` to disable it. See the
|
|
:doc:`compression guide <../../topics/compression>` for details.
|
|
additional_headers (HeadersLike | None): Arbitrary HTTP headers to add
|
|
to the handshake request.
|
|
user_agent_header: Value of the ``User-Agent`` request header.
|
|
It defaults to ``"Python/x.y.z websockets/X.Y"``.
|
|
Setting it to :obj:`None` removes the header.
|
|
proxy: If a proxy is configured, it is used by default. Set ``proxy``
|
|
to :obj:`None` to disable the proxy or to the address of a proxy
|
|
to override the system configuration. See the :doc:`proxy docs
|
|
<../../topics/proxies>` for details.
|
|
proxy_ssl: Configuration for enabling TLS on the proxy connection.
|
|
proxy_server_hostname: Host name for the TLS handshake with the proxy.
|
|
``proxy_server_hostname`` overrides the host name from ``proxy``.
|
|
open_timeout: Timeout for opening the connection in seconds.
|
|
:obj:`None` disables the timeout.
|
|
ping_interval: Interval between keepalive pings in seconds.
|
|
:obj:`None` disables keepalive.
|
|
ping_timeout: Timeout for keepalive pings in seconds.
|
|
:obj:`None` disables timeouts.
|
|
close_timeout: Timeout for closing the connection in seconds.
|
|
:obj:`None` disables the timeout.
|
|
max_size: Maximum size of incoming messages in bytes.
|
|
:obj:`None` disables the limit. You may pass a ``(max_message_size,
|
|
max_fragment_size)`` tuple to set different limits for messages and
|
|
fragments when you expect long messages sent in short fragments.
|
|
max_queue: High-water mark of the buffer where frames are received.
|
|
It defaults to 16 frames. The low-water mark defaults to ``max_queue
|
|
// 4``. You may pass a ``(high, low)`` tuple to set the high-water
|
|
and low-water marks. If you want to disable flow control entirely,
|
|
you may set it to ``None``, although that's a bad idea.
|
|
logger: Logger for this client.
|
|
It defaults to ``logging.getLogger("websockets.client")``.
|
|
See the :doc:`logging guide <../../topics/logging>` for details.
|
|
create_connection: Factory for the :class:`ClientConnection` managing
|
|
the connection. Set it to a wrapper or a subclass to customize
|
|
connection handling.
|
|
|
|
Any other keyword arguments are passed to :func:`~socket.create_connection`.
|
|
|
|
Raises:
|
|
InvalidURI: If ``uri`` isn't a valid WebSocket URI.
|
|
OSError: If the TCP connection fails.
|
|
InvalidHandshake: If the opening handshake fails.
|
|
TimeoutError: If the opening handshake times out.
|
|
|
|
"""
|
|
|
|
# Process parameters
|
|
|
|
# Backwards compatibility: ssl used to be called ssl_context.
|
|
if ssl is None and "ssl_context" in kwargs:
|
|
ssl = kwargs.pop("ssl_context")
|
|
warnings.warn( # deprecated in 13.0 - 2024-08-20
|
|
"ssl_context was renamed to ssl",
|
|
DeprecationWarning,
|
|
)
|
|
|
|
ws_uri = parse_uri(uri)
|
|
if not ws_uri.secure and ssl is not None:
|
|
raise ValueError("ssl argument is incompatible with a ws:// URI")
|
|
|
|
# Private APIs for unix_connect()
|
|
unix: bool = kwargs.pop("unix", False)
|
|
path: str | None = kwargs.pop("path", None)
|
|
|
|
if unix:
|
|
if path is None and sock is None:
|
|
raise ValueError("missing path argument")
|
|
elif path is not None and sock is not None:
|
|
raise ValueError("path and sock arguments are incompatible")
|
|
|
|
if subprotocols is not None:
|
|
validate_subprotocols(subprotocols)
|
|
|
|
if compression == "deflate":
|
|
extensions = enable_client_permessage_deflate(extensions)
|
|
elif compression is not None:
|
|
raise ValueError(f"unsupported compression: {compression}")
|
|
|
|
if unix:
|
|
proxy = None
|
|
if sock is not None:
|
|
proxy = None
|
|
if proxy is True:
|
|
proxy = get_proxy(ws_uri)
|
|
|
|
# Calculate timeouts on the TCP, TLS, and WebSocket handshakes.
|
|
# The TCP and TLS timeouts must be set on the socket, then removed
|
|
# to avoid conflicting with the WebSocket timeout in handshake().
|
|
deadline = Deadline(open_timeout)
|
|
|
|
if create_connection is None:
|
|
create_connection = ClientConnection
|
|
|
|
try:
|
|
# Connect socket
|
|
|
|
if sock is None:
|
|
if unix:
|
|
sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
|
|
sock.settimeout(deadline.timeout())
|
|
assert path is not None # mypy cannot figure this out
|
|
sock.connect(path)
|
|
elif proxy is not None:
|
|
proxy_parsed = parse_proxy(proxy)
|
|
if proxy_parsed.scheme[:5] == "socks":
|
|
# Connect to the server through the proxy.
|
|
sock = connect_socks_proxy(
|
|
proxy_parsed,
|
|
ws_uri,
|
|
deadline,
|
|
# websockets is consistent with the socket module while
|
|
# python_socks is consistent across implementations.
|
|
local_addr=kwargs.pop("source_address", None),
|
|
)
|
|
elif proxy_parsed.scheme[:4] == "http":
|
|
# Validate the proxy_ssl argument.
|
|
if proxy_parsed.scheme != "https" and proxy_ssl is not None:
|
|
raise ValueError(
|
|
"proxy_ssl argument is incompatible with an http:// proxy"
|
|
)
|
|
# Connect to the server through the proxy.
|
|
sock = connect_http_proxy(
|
|
proxy_parsed,
|
|
ws_uri,
|
|
deadline,
|
|
user_agent_header=user_agent_header,
|
|
ssl=proxy_ssl,
|
|
server_hostname=proxy_server_hostname,
|
|
**kwargs,
|
|
)
|
|
else:
|
|
raise AssertionError("unsupported proxy")
|
|
else:
|
|
kwargs.setdefault("timeout", deadline.timeout())
|
|
sock = socket.create_connection(
|
|
(ws_uri.host, ws_uri.port),
|
|
**kwargs,
|
|
)
|
|
sock.settimeout(None)
|
|
|
|
# Disable Nagle algorithm
|
|
|
|
if not unix:
|
|
sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, True)
|
|
|
|
# Initialize TLS wrapper and perform TLS handshake
|
|
|
|
if ws_uri.secure:
|
|
if ssl is None:
|
|
ssl = ssl_module.create_default_context()
|
|
if server_hostname is None:
|
|
server_hostname = ws_uri.host
|
|
sock.settimeout(deadline.timeout())
|
|
if proxy_ssl is None:
|
|
sock = ssl.wrap_socket(sock, server_hostname=server_hostname)
|
|
else:
|
|
sock_2 = SSLSSLSocket(sock, ssl, server_hostname=server_hostname)
|
|
# Let's pretend that sock is a socket, even though it isn't.
|
|
sock = cast(socket.socket, sock_2)
|
|
sock.settimeout(None)
|
|
|
|
# Initialize WebSocket protocol
|
|
|
|
protocol = ClientProtocol(
|
|
ws_uri,
|
|
origin=origin,
|
|
extensions=extensions,
|
|
subprotocols=subprotocols,
|
|
max_size=max_size,
|
|
logger=logger,
|
|
)
|
|
|
|
# Initialize WebSocket connection
|
|
|
|
connection = create_connection(
|
|
sock,
|
|
protocol,
|
|
ping_interval=ping_interval,
|
|
ping_timeout=ping_timeout,
|
|
close_timeout=close_timeout,
|
|
max_queue=max_queue,
|
|
)
|
|
except Exception:
|
|
if sock is not None:
|
|
sock.close()
|
|
raise
|
|
|
|
try:
|
|
connection.handshake(
|
|
additional_headers,
|
|
user_agent_header,
|
|
deadline.timeout(),
|
|
)
|
|
except Exception:
|
|
connection.close_socket()
|
|
connection.recv_events_thread.join()
|
|
raise
|
|
|
|
connection.start_keepalive()
|
|
return connection
|
|
|
|
|
|
def unix_connect(
|
|
path: str | None = None,
|
|
uri: str | None = None,
|
|
**kwargs: Any,
|
|
) -> ClientConnection:
|
|
"""
|
|
Connect to a WebSocket server listening on a Unix socket.
|
|
|
|
This function accepts the same keyword arguments as :func:`connect`.
|
|
|
|
It's only available on Unix.
|
|
|
|
It's mainly useful for debugging servers listening on Unix sockets.
|
|
|
|
Args:
|
|
path: File system path to the Unix socket.
|
|
uri: URI of the WebSocket server. ``uri`` defaults to
|
|
``ws://localhost/`` or, when a ``ssl`` is provided, to
|
|
``wss://localhost/``.
|
|
|
|
"""
|
|
if uri is None:
|
|
# Backwards compatibility: ssl used to be called ssl_context.
|
|
if kwargs.get("ssl") is None and kwargs.get("ssl_context") is None:
|
|
uri = "ws://localhost/"
|
|
else:
|
|
uri = "wss://localhost/"
|
|
return connect(uri=uri, unix=True, path=path, **kwargs)
|
|
|
|
|
|
try:
|
|
from python_socks import ProxyType
|
|
from python_socks.sync import Proxy as SocksProxy
|
|
|
|
except ImportError:
|
|
|
|
def connect_socks_proxy(
|
|
proxy: Proxy,
|
|
ws_uri: WebSocketURI,
|
|
deadline: Deadline,
|
|
**kwargs: Any,
|
|
) -> socket.socket:
|
|
raise ImportError("connecting through a SOCKS proxy requires python-socks")
|
|
|
|
else:
|
|
SOCKS_PROXY_TYPES = {
|
|
"socks5h": ProxyType.SOCKS5,
|
|
"socks5": ProxyType.SOCKS5,
|
|
"socks4a": ProxyType.SOCKS4,
|
|
"socks4": ProxyType.SOCKS4,
|
|
}
|
|
|
|
SOCKS_PROXY_RDNS = {
|
|
"socks5h": True,
|
|
"socks5": False,
|
|
"socks4a": True,
|
|
"socks4": False,
|
|
}
|
|
|
|
def connect_socks_proxy(
|
|
proxy: Proxy,
|
|
ws_uri: WebSocketURI,
|
|
deadline: Deadline,
|
|
**kwargs: Any,
|
|
) -> socket.socket:
|
|
"""Connect via a SOCKS proxy and return the socket."""
|
|
socks_proxy = SocksProxy(
|
|
SOCKS_PROXY_TYPES[proxy.scheme],
|
|
proxy.host,
|
|
proxy.port,
|
|
proxy.username,
|
|
proxy.password,
|
|
SOCKS_PROXY_RDNS[proxy.scheme],
|
|
)
|
|
kwargs.setdefault("timeout", deadline.timeout())
|
|
# connect() is documented to raise OSError and TimeoutError.
|
|
# Wrap other exceptions in ProxyError, a subclass of InvalidHandshake.
|
|
try:
|
|
return socks_proxy.connect(ws_uri.host, ws_uri.port, **kwargs)
|
|
except (OSError, TimeoutError, socket.timeout):
|
|
raise
|
|
except Exception as exc:
|
|
raise ProxyError("failed to connect to SOCKS proxy") from exc
|
|
|
|
|
|
def read_connect_response(sock: socket.socket, deadline: Deadline) -> Response:
|
|
reader = StreamReader()
|
|
parser = Response.parse(
|
|
reader.read_line,
|
|
reader.read_exact,
|
|
reader.read_to_eof,
|
|
proxy=True,
|
|
)
|
|
try:
|
|
while True:
|
|
sock.settimeout(deadline.timeout())
|
|
data = sock.recv(4096)
|
|
if data:
|
|
reader.feed_data(data)
|
|
else:
|
|
reader.feed_eof()
|
|
next(parser)
|
|
except StopIteration as exc:
|
|
assert isinstance(exc.value, Response) # help mypy
|
|
response = exc.value
|
|
if 200 <= response.status_code < 300:
|
|
return response
|
|
else:
|
|
raise InvalidProxyStatus(response)
|
|
except socket.timeout:
|
|
raise TimeoutError("timed out while connecting to HTTP proxy")
|
|
except Exception as exc:
|
|
raise InvalidProxyMessage(
|
|
"did not receive a valid HTTP response from proxy"
|
|
) from exc
|
|
finally:
|
|
sock.settimeout(None)
|
|
|
|
|
|
def connect_http_proxy(
|
|
proxy: Proxy,
|
|
ws_uri: WebSocketURI,
|
|
deadline: Deadline,
|
|
*,
|
|
user_agent_header: str | None = None,
|
|
ssl: ssl_module.SSLContext | None = None,
|
|
server_hostname: str | None = None,
|
|
**kwargs: Any,
|
|
) -> socket.socket:
|
|
# Connect socket
|
|
|
|
kwargs.setdefault("timeout", deadline.timeout())
|
|
sock = socket.create_connection((proxy.host, proxy.port), **kwargs)
|
|
|
|
# Initialize TLS wrapper and perform TLS handshake
|
|
|
|
if proxy.scheme == "https":
|
|
if ssl is None:
|
|
ssl = ssl_module.create_default_context()
|
|
if server_hostname is None:
|
|
server_hostname = proxy.host
|
|
sock.settimeout(deadline.timeout())
|
|
sock = ssl.wrap_socket(sock, server_hostname=server_hostname)
|
|
sock.settimeout(None)
|
|
|
|
# Send CONNECT request to the proxy and read response.
|
|
|
|
sock.sendall(prepare_connect_request(proxy, ws_uri, user_agent_header))
|
|
try:
|
|
read_connect_response(sock, deadline)
|
|
except Exception:
|
|
sock.close()
|
|
raise
|
|
|
|
return sock
|
|
|
|
|
|
T = TypeVar("T")
|
|
F = TypeVar("F", bound=Callable[..., T])
|
|
|
|
|
|
class SSLSSLSocket:
|
|
"""
|
|
Socket-like object providing TLS-in-TLS.
|
|
|
|
Only methods that are used by websockets are implemented.
|
|
|
|
"""
|
|
|
|
recv_bufsize = 65536
|
|
|
|
def __init__(
|
|
self,
|
|
sock: socket.socket,
|
|
ssl_context: ssl_module.SSLContext,
|
|
server_hostname: str | None = None,
|
|
) -> None:
|
|
self.incoming = ssl_module.MemoryBIO()
|
|
self.outgoing = ssl_module.MemoryBIO()
|
|
self.ssl_socket = sock
|
|
self.ssl_object = ssl_context.wrap_bio(
|
|
self.incoming,
|
|
self.outgoing,
|
|
server_hostname=server_hostname,
|
|
)
|
|
self.run_io(self.ssl_object.do_handshake)
|
|
|
|
def run_io(self, func: Callable[..., T], *args: Any) -> T:
|
|
while True:
|
|
want_read = False
|
|
want_write = False
|
|
try:
|
|
result = func(*args)
|
|
except ssl_module.SSLWantReadError:
|
|
want_read = True
|
|
except ssl_module.SSLWantWriteError: # pragma: no cover
|
|
want_write = True
|
|
|
|
# Write outgoing data in all cases.
|
|
data = self.outgoing.read()
|
|
if data:
|
|
self.ssl_socket.sendall(data)
|
|
|
|
# Read incoming data and retry on SSLWantReadError.
|
|
if want_read:
|
|
data = self.ssl_socket.recv(self.recv_bufsize)
|
|
if data:
|
|
self.incoming.write(data)
|
|
else:
|
|
self.incoming.write_eof()
|
|
continue
|
|
# Retry after writing outgoing data on SSLWantWriteError.
|
|
if want_write: # pragma: no cover
|
|
continue
|
|
# Return result if no error happened.
|
|
return result
|
|
|
|
def recv(self, buflen: int) -> bytes:
|
|
try:
|
|
return self.run_io(self.ssl_object.read, buflen)
|
|
except ssl_module.SSLEOFError:
|
|
return b"" # always ignore ragged EOFs
|
|
|
|
def send(self, data: BytesLike) -> int:
|
|
return self.run_io(self.ssl_object.write, data)
|
|
|
|
def sendall(self, data: BytesLike) -> None:
|
|
# adapted from ssl_module.SSLSocket.sendall()
|
|
count = 0
|
|
with memoryview(data) as view, view.cast("B") as byte_view:
|
|
amount = len(byte_view)
|
|
while count < amount:
|
|
count += self.send(byte_view[count:])
|
|
|
|
# recv_into(), recvfrom(), recvfrom_into(), sendto(), unwrap(), and the
|
|
# flags argument aren't implemented because websockets doesn't need them.
|
|
|
|
def __getattr__(self, name: str) -> Any:
|
|
return getattr(self.ssl_socket, name)
|