Skip to content

Fix reconnection with a cached base token #107

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
JJTech0130 merged 1 commit into from
Mar 15, 2026
Merged

Fix reconnection with a cached base token #107

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
27 changes: 11 additions & 16 deletions pypush/apns/lifecycle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ def __init__(

@property
async def base_token(self) -> bytes:
if self._base_token is None:
await self._connected.wait()
await self._connected.wait()
assert self._base_token is not None
return self._base_token

Expand Down Expand Up @@ -134,25 +133,21 @@ async def reconnect(self):

self._tg.start_soon(self._receive_task)
ack = await self._receive(
filters.chain(
filters.cmd(protocol.ConnectAck),
lambda c: (
c
if (
c.token == self._base_token
if self._base_token is not None
else True
)
else None
),
)
filters.cmd(protocol.ConnectAck),
)
logging.debug(f"Connected with ack: {ack}")
assert ack.status == 0
if self._base_token is None:
if ack.token is None:
# Server accepted the cached token without returning a new one
logging.debug(f"Base token accepted by server: {self._base_token.hex()}")
elif self._base_token is None:
self._base_token = ack.token
logging.debug(f"Base token assigned: {ack.token.hex()}")
elif ack.token != self._base_token:
logging.warning(f"Base token changed: {self._base_token.hex()} -> {ack.token.hex()}")
self._base_token = ack.token
else:
assert ack.token == self._base_token
logging.debug(f"Base token confirmed: {ack.token.hex()}")
if not self._connected.is_set():
self._connected.set()

Expand Down
Loading