Skip to content

move unsubscribe & unregister functionality into Session #211

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

Merged
om26er merged 1 commit into from
Oct 31, 2025
Merged

move unsubscribe & unregister functionality into Session #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 28 additions & 24 deletions xconn/async_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,7 @@ def __init__(self, registration_id: int, session: AsyncSession):
self._session = session

async def unregister(self) -> None:
if not await self._session._base_session.transport.is_connected():
raise Exception("cannot unregister procedure: session not established")

unregister = messages.Unregister(messages.UnregisterFields(self._session._idgen.next(), self.registration_id))
data = self._session._session.send_message(unregister)

f: Future = Future()
self._session._unregister_requests[unregister.request_id] = types.UnregisterRequest(f, self.registration_id)
await self._session._base_session.send(data)

return await f
return await self._session._unregister(self)


@dataclass
Expand All @@ -50,19 +40,7 @@ def __init__(self, subscription_id: int, session: AsyncSession):
self._session = session

async def unsubscribe(self) -> None:
if not await self._session._base_session.transport.is_connected():
raise Exception("cannot unsubscribe topic: session not established")

unsubscribe = messages.Unsubscribe(
messages.UnsubscribeFields(self._session._idgen.next(), self.subscription_id)
)
data = self._session._session.send_message(unsubscribe)

f: Future = Future()
self._session._unsubscribe_requests[unsubscribe.request_id] = types.UnsubscribeRequest(f, self.subscription_id)
await self._session._base_session.send(data)

return await f
return await self._session._unsubscribe(self)


class AsyncSession:
Expand Down Expand Up @@ -237,6 +215,19 @@ async def call(

return await f

async def _unregister(self, reg: Registration) -> None:
if not await self._base_session.transport.is_connected():
raise Exception("cannot unregister procedure: session not established")

unregister = messages.Unregister(messages.UnregisterFields(self._idgen.next(), reg.registration_id))
data = self._session.send_message(unregister)

f: Future = Future()
self._unregister_requests[unregister.request_id] = types.UnregisterRequest(f, reg.registration_id)
await self._base_session.send(data)

return await f

async def subscribe(
self, topic: str, event_handler: Callable[[types.Event], Awaitable[None]], options: dict | None = None
) -> Subscription:
Expand Down Expand Up @@ -266,6 +257,19 @@ async def publish(

await self._base_session.send(data)

async def _unsubscribe(self, sub: Subscription) -> None:
if not await self._base_session.transport.is_connected():
raise Exception("cannot unsubscribe topic: session not established")

unsubscribe = messages.Unsubscribe(messages.UnsubscribeFields(self._idgen.next(), sub.subscription_id))
data = self._session.send_message(unsubscribe)

f: Future = Future()
self._unsubscribe_requests[unsubscribe.request_id] = types.UnsubscribeRequest(f, sub.subscription_id)
await self._base_session.send(data)

return await f

async def leave(self) -> None:
self._goodbye_request = Future()

Expand Down
52 changes: 28 additions & 24 deletions xconn/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,7 @@ def __init__(self, registration_id: int, session: Session):
self._session = session

def unregister(self) -> None:
if not self._session._base_session.transport.is_connected():
raise Exception("cannot unregister procedure: session not established")

unregister = messages.Unregister(messages.UnregisterFields(self._session._idgen.next(), self.registration_id))
data = self._session._session.send_message(unregister)

f: Future = Future()
self._session._unregister_requests[unregister.request_id] = types.UnregisterRequest(f, self.registration_id)
self._session._base_session.send(data)

f.result()
self._session._unregister(self)


@dataclass
Expand All @@ -49,19 +39,7 @@ def __init__(self, subscription_id: int, session: Session):
self._session = session

def unsubscribe(self) -> None:
if not self._session._base_session.transport.is_connected():
raise Exception("cannot unsubscribe topic: session not established")

unsubscribe = messages.Unsubscribe(
messages.UnsubscribeFields(self._session._idgen.next(), self.subscription_id)
)
data = self._session._session.send_message(unsubscribe)

f: Future = Future()
self._session._unsubscribe_requests[unsubscribe.request_id] = types.UnsubscribeRequest(f, self.subscription_id)
self._session._base_session.send(data)

f.result()
self._session._unsubscribe(self)


class Session:
Expand Down Expand Up @@ -252,6 +230,19 @@ def register(

return f.result()

def _unregister(self, reg: Registration) -> None:
if not self._base_session.transport.is_connected():
raise Exception("cannot unregister procedure: session not established")

unregister = messages.Unregister(messages.UnregisterFields(self._idgen.next(), reg.registration_id))
data = self._session.send_message(unregister)

f: Future = Future()
self._unregister_requests[unregister.request_id] = types.UnregisterRequest(f, reg.registration_id)
self._base_session.send(data)

f.result()

def subscribe(self, topic: str, event_handler: Callable[[types.Event], None], options: dict = None) -> Subscription:
subscribe = messages.Subscribe(messages.SubscribeFields(self._idgen.next(), topic, options=options))
data = self._session.send_message(subscribe)
Expand All @@ -274,6 +265,19 @@ def publish(self, topic: str, args: list[Any] = None, kwargs: dict = None, optio

self._base_session.send(data)

def _unsubscribe(self, sub: Subscription) -> None:
if not self._base_session.transport.is_connected():
raise Exception("cannot unsubscribe topic: session not established")

unsubscribe = messages.Unsubscribe(messages.UnsubscribeFields(self._idgen.next(), sub.subscription_id))
data = self._session.send_message(unsubscribe)

f: Future = Future()
self._unsubscribe_requests[unsubscribe.request_id] = types.UnsubscribeRequest(f, sub.subscription_id)
self._base_session.send(data)

f.result()

def leave(self):
self._goodbye_request = Future()

Expand Down