Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add max_message_size as a configurable connection parameter #470

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add max_message_size as a configurable connection parameter #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8056ac
Add max_message_size as a configurable connection parameter
Jul 14, 2023
e6c7c02
fix formatting
Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions nats/aio/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
DEFAULT_FLUSH_TIMEOUT = 10 # in seconds
DEFAULT_CONNECT_TIMEOUT = 2 # in seconds
DEFAULT_DRAIN_TIMEOUT = 30 # in seconds
DEFAULT_MAX_MESSAGE_SIZE = 4 * 1024 * 1024
MAX_CONTROL_LINE_SIZE = 1024

NATS_HDR_LINE = bytearray(b'NATS/1.0')
Expand Down Expand Up @@ -315,6 +316,7 @@ async def connect(
inbox_prefix: Union[str, bytes] = DEFAULT_INBOX_PREFIX,
pending_size: int = DEFAULT_PENDING_SIZE,
flush_timeout: Optional[float] = None,
max_message_size: int = DEFAULT_MAX_MESSAGE_SIZE
) -> None:
"""
Establishes a connection to NATS.
Expand Down Expand Up @@ -445,6 +447,7 @@ async def subscribe_handler(msg):
self.options["token"] = token
self.options["connect_timeout"] = connect_timeout
self.options["drain_timeout"] = drain_timeout
self.options["max_message_size"] = max_message_size

if tls:
self.options['tls'] = tls
Expand Down Expand Up @@ -1309,13 +1312,15 @@ async def _select_next_server(self) -> None:
s.uri,
ssl_context=self.ssl_context,
buffer_size=DEFAULT_BUFFER_SIZE,
connect_timeout=self.options['connect_timeout']
connect_timeout=self.options['connect_timeout'],
max_msg_size=self.options['max_message_size']
)
else:
await self._transport.connect(
s.uri,
buffer_size=DEFAULT_BUFFER_SIZE,
connect_timeout=self.options['connect_timeout']
connect_timeout=self.options['connect_timeout'],
max_msg_size=self.options['max_message_size']
)
self._current_server = s
break
Expand Down
35 changes: 15 additions & 20 deletions nats/aio/transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ class Transport(abc.ABC):

@abc.abstractmethod
async def connect(
self, uri: ParseResult, buffer_size: int, connect_timeout: int
self, uri: ParseResult, buffer_size: int, connect_timeout: int,
max_message_size: int
):
"""
Connects to a server using the implemented transport. The uri passed is of type ParseResult that can be
Expand All @@ -28,11 +29,8 @@ async def connect(

@abc.abstractmethod
async def connect_tls(
self,
uri: Union[str, ParseResult],
ssl_context: ssl.SSLContext,
buffer_size: int,
connect_timeout: int,
self, uri: Union[str, ParseResult], ssl_context: ssl.SSLContext,
buffer_size: int, connect_timeout: int, max_message_size: int
):
"""
connect_tls is similar to connect except it tries to connect to a secure endpoint, using the provided ssl
Expand Down Expand Up @@ -116,7 +114,8 @@ def __init__(self):
self._io_writer: Optional[asyncio.StreamWriter] = None

async def connect(
self, uri: ParseResult, buffer_size: int, connect_timeout: int
self, uri: ParseResult, buffer_size: int, connect_timeout: int,
max_message_size: int
):
r, w = await asyncio.wait_for(
asyncio.open_connection(
Expand All @@ -136,11 +135,8 @@ async def connect(
self._bare_io_writer = self._io_writer = w

async def connect_tls(
self,
uri: Union[str, ParseResult],
ssl_context: ssl.SSLContext,
buffer_size: int,
connect_timeout: int,
self, uri: Union[str, ParseResult], ssl_context: ssl.SSLContext,
buffer_size: int, connect_timeout: int, max_message_size: int
) -> None:
assert self._io_writer, f'{type(self).__name__}.connect must be called first'

Expand Down Expand Up @@ -203,20 +199,18 @@ def __init__(self):
self._using_tls: Optional[bool] = None

async def connect(
self, uri: ParseResult, buffer_size: int, connect_timeout: int
self, uri: ParseResult, buffer_size: int, connect_timeout: int,
max_msg_size: int
):
# for websocket library, the uri must contain the scheme already
self._ws = await self._client.ws_connect(
uri.geturl(), timeout=connect_timeout
uri.geturl(), timeout=connect_timeout, max_msg_size=max_msg_size
)
self._using_tls = False

async def connect_tls(
self,
uri: Union[str, ParseResult],
ssl_context: ssl.SSLContext,
buffer_size: int,
connect_timeout: int,
self, uri: Union[str, ParseResult], ssl_context: ssl.SSLContext,
buffer_size: int, connect_timeout: int, max_msg_size: int
):
if self._ws and not self._ws.closed:
if self._using_tls:
Expand All @@ -226,7 +220,8 @@ async def connect_tls(
self._ws = await self._client.ws_connect(
uri if isinstance(uri, str) else uri.geturl(),
ssl=ssl_context,
timeout=connect_timeout
timeout=connect_timeout,
max_msg_size=max_msg_size
)
self._using_tls = True

Expand Down