Xtao-Labs/MTPyroger
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix time going out of sync when starting new sessions

Browse Source
This commit is contained in:
Dan 2020-08-22 11:26:11 +02:00
parent d7be2c90a1
commit fbded4e23b
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pyrogram/session/internals/msg_factory.py
View File

@ -26,14 +26,13 @@ not_content_related = (Ping, HttpWait, MsgsAck, MsgContainer)
class MsgFactory: class MsgFactory:
def __init__(self, server_time: float = 0): def __init__(self):
self.seq_no = SeqNo() self.seq_no = SeqNo()
self.server_time = server_time
def __call__(self, body: TLObject) -> Message: def __call__(self, body: TLObject) -> Message:
return Message( return Message(
body, body,
MsgId(self.server_time), MsgId(),
self.seq_no(not isinstance(body, not_content_related)), self.seq_no(not isinstance(body, not_content_related)),
len(body) len(body)
) )

15
pyrogram/session/internals/msg_id.py
View File

@ -16,18 +16,29 @@
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with Pyrogram. If not, see <http://www.gnu.org/licenses/>. # along with Pyrogram. If not, see <http://www.gnu.org/licenses/>.
import logging
from datetime import datetime
from time import monotonic from time import monotonic
log = logging.getLogger(__name__)
class MsgId: class MsgId:
reference_clock = monotonic() reference_clock = monotonic()
last_time = 0 last_time = 0
msg_id_offset = 0 msg_id_offset = 0
server_time = 0
def __new__(cls, server_time: float = 0) -> int: def __new__(cls) -> int:
now = monotonic() - cls.reference_clock + server_time now = monotonic() - cls.reference_clock + cls.server_time
cls.msg_id_offset = cls.msg_id_offset + 4 if now == cls.last_time else 0 cls.msg_id_offset = cls.msg_id_offset + 4 if now == cls.last_time else 0
msg_id = int(now * 2 ** 32) + cls.msg_id_offset msg_id = int(now * 2 ** 32) + cls.msg_id_offset
cls.last_time = now cls.last_time = now
return msg_id return msg_id
@classmethod
def set_server_time(cls, server_time: int):
if not cls.server_time:
cls.server_time = server_time
log.info(f"Time synced: {datetime.utcfromtimestamp(server_time)} UTC")

7
pyrogram/session/session.py
View File

@ -23,6 +23,7 @@ from concurrent.futures.thread import ThreadPoolExecutor
from datetime import datetime, timedelta from datetime import datetime, timedelta
from hashlib import sha1 from hashlib import sha1
from io import BytesIO from io import BytesIO
import os
import pyrogram import pyrogram
from pyrogram import __copyright__, __license__, __version__ from pyrogram import __copyright__, __license__, __version__
@ -96,7 +97,7 @@ class Session:
self.auth_key_id = sha1(auth_key).digest()[-8:] self.auth_key_id = sha1(auth_key).digest()[-8:]
self.session_id = Long(MsgId(time.time())) self.session_id = os.urandom(8)
self.msg_factory = MsgFactory() self.msg_factory = MsgFactory()
self.current_salt = None self.current_salt = None
@ -247,9 +248,7 @@ class Session:
for msg in messages: for msg in messages:
if msg.seq_no == 0: if msg.seq_no == 0:
server_time = msg.msg_id / (2 ** 32) MsgId.set_server_time(msg.msg_id / (2 ** 32))
self.msg_factory.server_time = server_time
log.info(f"Time synced: {datetime.utcfromtimestamp(server_time)} UTC")
if msg.seq_no % 2 != 0: if msg.seq_no % 2 != 0:
if msg.msg_id in self.pending_acks: if msg.msg_id in self.pending_acks: