LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2024-11-22 01:16:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle auth errors during get difference

Browse Source
This commit is contained in:
Lonami Exo 2022-09-20 11:35:59 +02:00
parent 06536cfb91
commit 243f58c331
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
telethon/_updates/messagebox.py
View File

@ -611,6 +611,19 @@ class MessageBox:
return updates, diff.users, diff.chats
def end_difference(self):
account = ENTRY_ACCOUNT in self.getting_diff_for
secret = ENTRY_SECRET in self.getting_diff_for
if not account and not secret:
raise RuntimeWarning('Should not be ending get difference when neither account or secret was diff was active')
# Both may be active if both expired at the same time.
if account:
self.end_get_diff(ENTRY_ACCOUNT)
if secret:
self.end_get_diff(ENTRY_SECRET)
# endregion Getting and applying account difference.
# region Getting and applying channel difference.

27
telethon/client/updates.py
View File

@ -270,7 +270,13 @@ class UpdateMethods:
get_diff = self._message_box.get_difference()
if get_diff:
self._log[__name__].info('Getting difference for account updates')
diff = await self(get_diff)
try:
diff = await self(get_diff)
except (errors.UnauthorizedError, errors.AuthKeyError) as e:
# Not logged in or broken authorization key, can't get difference
self._log[__name__].info('Cannot get difference since the account is not logged in: %s', type(e).__name__)
self._message_box.end_difference()
continue
updates, users, chats = self._message_box.apply_difference(diff, self._mb_entity_cache)
updates_to_dispatch.extend(self._preprocess_updates(updates, users, chats))
continue
@ -280,7 +286,13 @@ class UpdateMethods:
self._log[__name__].info('Getting difference for channel updates')
try:
diff = await self(get_diff)
except (errors.PersistentTimestampOutdatedError, errors.PersistentTimestampInvalidError, ValueError) as e:
except (
errors.PersistentTimestampOutdatedError,
errors.PersistentTimestampInvalidError,
errors.UnauthorizedError,
errors.AuthKeyError,
ValueError
) as e:
# According to Telegram's docs:
# "Channel internal replication issues, try again later (treat this like an RPC_CALL_FAIL)."
# We can treat this as "empty difference" and not update the local pts.
@ -297,15 +309,10 @@ class UpdateMethods:
# Somehow our pts is either too new or the server does not know about this.
# We treat this as PersistentTimestampOutdatedError for now.
# TODO investigate why/when this happens and if this is the proper solution
if isinstance(e, errors.PersistentTimestampOutdatedError):
reason = 'caused PersistentTimestampOutdated'
elif isinstance(e, errors.PersistentTimestampInvalidError):
reason = 'caused PersistentTimestampInvalidError'
else:
reason = 'is failing'
self._log[__name__].warning(
'Getting difference for channel updates %s;'
' ending getting difference prematurely until server issues are resolved', reason
'Getting difference for channel updates caused %s;'
' ending getting difference prematurely until server issues are resolved',
type(e).__name__
)
self._message_box.end_channel_difference(
get_diff,