fixed some time sync stuff

Author: Hexalgo

pydofus2/com/DofusClient.py

@@ -81,6 +81,7 @@ def __init__(self, name="DofusClient"):
         self._taking_nap = False
         self._startTime = None
         self._status = None
+        self.session_run_id = None
         self.kernel = None
         self.terminated = threading.Event()
 
@@ -131,6 +132,7 @@ def init(self):
         atexit.register(self.at_exit)
         self.zaap = ZaapDecoy(self._apikey)
         self.kernel = Kernel()
+        self.kernel.client = self
         self.kernel.init()
         AdapterFactory.addAdapter("ele", ElementsAdapter)
         # AdapterFactory.addAdapter("dlm", MapsAdapter)

pydofus2/com/ankamagames/berilia/managers/KernelEvent.py

@@ -7,6 +7,7 @@ class KernelEvent(Enum):
     KamasSpentOnSellTax = auto()
     FarmPathStart = auto()
     Paused = auto()
+    MarketOfflineSales = auto()
 
     # Market
     MarketPriceChanged = auto()

pydofus2/com/ankamagames/dofus/kernel/Kernel.py

@@ -55,6 +55,7 @@
     from pydofus2.com.ankamagames.dofus.logic.game.roleplay.frames.RoleplayMovementFrame import RoleplayMovementFrame
     from pydofus2.com.ankamagames.dofus.logic.game.roleplay.frames.RoleplayWorldFrame import RoleplayWorldFrame
     from pydofus2.com.ankamagames.dofus.logic.game.roleplay.frames.ZaapFrame import ZaapFrame
+    from pydofus2.com.DofusClient import DofusClient
 
 
 class Kernel(metaclass=Singleton):
@@ -64,6 +65,7 @@ def __init__(self) -> None:
         self._reset = True
         self.isMule = False
         self.restart_on_unexpected_conn_close = False
+        self.client: "DofusClient" = None
 
     @property
     def worker(self) -> Worker:

pydofus2/com/ankamagames/dofus/logic/common/frames/MarketFrame.py

@@ -87,6 +87,7 @@ def __init__(self):
         self._state = "INIT"
         self._current_mode = None
         self._market_mapId = None
+        self._market_gfx = None
         self._search_item_listener = None
 
     @property
@@ -106,6 +107,7 @@ def reset_state(self):
             self._bids_manager.max_item_level = None
             self._bids_manager.allowed_types = None
             self._bids_manager.npc_id = None
+            self._market_gfx = None
         self._market_type_open = None
         self._current_mode = None
         self._current_searched_item_gid = None
@@ -117,9 +119,7 @@ def pulled(self) -> bool:
 
     def process(self, msg: Message) -> bool:
         if isinstance(msg, ExchangeOfflineSoldItemsMessage):
-            # FIXME: Implement this very important logic so we can save markets state offline
-            # items where sold when we where offline
-            # { "bidHouseItems": [ { "__type__": "ObjectItemQuantityPriceDateEffects", "objectGID": 443, "quantity": 100, "price": 3571, "effects": { "__type__": "ObjectEffects", "effects": [] }, "date": 1731091668 } ] }
+            KernelEventsManager().send(KernelEvent.MarketOfflineSales, msg.bidHouseItems)
             return True
 
         # Handle sell mode initialization

pydofus2/com/ankamagames/dofus/logic/common/managers/PlayerManager.py

@@ -110,10 +110,7 @@ def refreshSubscriptionEndDateUpdateTime(self) -> None:
         self._subscriptionEndDateUpdateTime = TimeManager().getUtcTimestamp()
 
     def isBasicAccount(self) -> bool:
-        # Logger().debug(f"Subscription end date : {self.subscriptionEndDate}")
-        # Logger().debug(f"Current timestamp : {TimeManager().getUtcTimestamp()}")
-        # Logger().debug(f"Has rights : {self.hasRights}")
-        return self.subscriptionEndDate / 1000 <= TimeManager().getUtcTimestamp() and not self.hasRights
+        return self.subscriptionEndDate <= TimeManager().getUtcTimestamp() and not self.hasRights
 
     def inHavenBag(self):
         from pydofus2.com.ankamagames.dofus.logic.game.common.managers.PlayedCharacterManager import (

pydofus2/com/ankamagames/dofus/logic/connection/frames/AuthenticationFrame.py

@@ -85,31 +85,32 @@ def process(self, msg: Message) -> bool:
             return True
 
         elif isinstance(msg, IdentificationSuccessMessage):
-            ismsg = msg
-            if isinstance(ismsg, IdentificationSuccessWithLoginTokenMessage):
-                AuthenticationManager().nextToken = IdentificationSuccessWithLoginTokenMessage(ismsg).loginToken
-            if ismsg.login:
-                AuthenticationManager().username = ismsg.login
-            PlayerManager().accountId = ismsg.accountId
-            PlayerManager().communityId = ismsg.communityId
-            PlayerManager().hasRights = ismsg.hasRights
-            PlayerManager().hasReportRight = ismsg.hasReportRight
-            PlayerManager().nickname = ismsg.accountTag.nickname
-            PlayerManager().tag = ismsg.accountTag.tagNumber
-            PlayerManager().subscriptionEndDate = ismsg.subscriptionEndDate
+            if isinstance(msg, IdentificationSuccessWithLoginTokenMessage):
+                AuthenticationManager().nextToken = msg.loginToken
+            if msg.login:
+                AuthenticationManager().username = msg.login
+            PlayerManager().accountId = msg.accountId
+            PlayerManager().communityId = msg.communityId
+            PlayerManager().hasRights = msg.hasRights
+            PlayerManager().hasReportRight = msg.hasReportRight
+            PlayerManager().nickname = msg.accountTag.nickname
+            PlayerManager().tag = msg.accountTag.tagNumber
+            PlayerManager().subscriptionEndDate = msg.subscriptionEndDate
             if PlayerManager().isBasicAccount():
                 Logger().info("Player has basic account")
-                formatted = "N/A"
             else:
-                formatted = TimeManager().getFormatterDateFromTime(ismsg.subscriptionEndDate)
-                Logger().info(f"Player subscription end date: {formatted}")
-            PlayerManager().accountCreation = ismsg.accountCreation
-            PlayerManager().wasAlreadyConnected = ismsg.wasAlreadyConnected
-            DataStoreType.ACCOUNT_ID = str(ismsg.accountId)
+                date = TimeManager().format_date_irl(msg.subscriptionEndDate, True)
+                time = TimeManager().format_clock(msg.subscriptionEndDate, True, True)
+                Logger().info(f"Player is subscribed until: {date} {time}")
+
+            PlayerManager().accountCreation = msg.accountCreation
+            PlayerManager().wasAlreadyConnected = msg.wasAlreadyConnected
+            DataStoreType.ACCOUNT_ID = str(msg.accountId)
             Kernel().worker.removeFrame(self)
             Kernel().worker.addFrame(CharacterFrame())
             Kernel().worker.addFrame(ServerSelectionFrame())
-            KernelEventsManager().send(KernelEvent.PlayerLoginSuccess, ismsg)
+            KernelEventsManager().send(KernelEvent.PlayerLoginSuccess, msg)
+            formatted = TimeManager().getFormatterDateFromTime(msg.subscriptionEndDate)
             KernelEventsManager().send(
                 KernelEvent.ClientStatusUpdate,
                 ClientStatusEnum.AUTHENTICATED_TO_LOGIN_SERVER,

pydofus2/com/ankamagames/dofus/logic/game/approach/frames/GameServerApproachFrame.py

@@ -1,5 +1,4 @@
 import time
-from datetime import datetime
 
 from prettytable import PrettyTable
 
@@ -128,7 +127,6 @@
     ServerConnectionFailedMessage,
 )
 from pydofus2.com.ankamagames.jerakine.network.NetworkMessage import NetworkMessage
-from pydofus2.com.ankamagames.jerakine.types.DataStoreType import DataStoreType
 from pydofus2.com.ankamagames.jerakine.types.enums.Priority import Priority
 from pydofus2.com.ClientStatusEnum import ClientStatusEnum
 
@@ -297,12 +295,10 @@ def process(self, msg: Message) -> bool:
             return True
 
         elif isinstance(msg, CharacterSelectedSuccessMessage):
-            cssmsg = msg
             self._loadingStart = time.perf_counter()
             if Kernel().worker.getFrameByName("ServerSelectionFrame"):
                 Kernel().worker.removeFrameByName("ServerSelectionFrame")
-            PlayedCharacterManager().infos = cssmsg.infos
-            DataStoreType.CHARACTER_ID = str(cssmsg.infos.id)
+            PlayedCharacterManager().infos = msg.infos
             Kernel().worker.addFrame(WorldFrame())
             Kernel().worker.addFrame(AlignmentFrame())
             Kernel().worker.addFrame(SynchronisationFrame())
@@ -317,13 +313,12 @@ def process(self, msg: Message) -> bool:
             Kernel().worker.addFrame(AveragePricesFrame())
             Kernel().worker.addFrame(NpcFrame())
             Kernel().worker.addFrame(PartyFrame())
-            KernelEventsManager().send(KernelEvent.CharacterSelectionSuccess, cssmsg.infos)
+            KernelEventsManager().send(KernelEvent.CharacterSelectionSuccess, msg.infos)
             KernelEventsManager().send(
-                KernelEvent.ClientStatusUpdate, ClientStatusEnum.CHARACTER_SELECTED, {"infos": cssmsg.infos.to_json()}
+                KernelEvent.ClientStatusUpdate, ClientStatusEnum.CHARACTER_SELECTED, {"infos": msg.infos.to_json()}
             )
-            self._cssmsg = cssmsg
+            self._cssmsg = msg
             PlayedCharacterManager().infos = self._cssmsg.infos
-            DataStoreType.CHARACTER_ID = str(self._cssmsg.infos.id)
             now = time.perf_counter()
             delta = now - self._loadingStart
             if delta > self.LOADING_TIMEOUT:
@@ -332,8 +327,8 @@ def process(self, msg: Message) -> bool:
 
         elif isinstance(msg, CharacterLoadingCompleteMessage):
             Kernel().worker.removeFrame(self)
-            gccrmsg = GameContextCreateRequestMessage()
-            ConnectionsHandler().send(gccrmsg)
+            msg = GameContextCreateRequestMessage()
+            ConnectionsHandler().send(msg)
             return True
 
         elif isinstance(msg, ConnectionResumedMessage):
@@ -349,13 +344,7 @@ def process(self, msg: Message) -> bool:
             return True
 
         elif isinstance(msg, BasicTimeMessage):
-            btmsg = msg
-            TimeManager().serverTimeLag = float(
-                btmsg.timestamp + btmsg.timezoneOffset * 60 * 1000 - datetime.now().timestamp()
-            )
-            TimeManager().serverUtcTimeLag = btmsg.timestamp - datetime.now().timestamp()
-            TimeManager().timezoneOffset = btmsg.timezoneOffset * 60 * 1000
-            TimeManager().dofusTimeYearLag = -1370
+            TimeManager().sync_with_server(msg)
             return True
 
         elif isinstance(msg, AccountSubscriptionElapsedDurationMessage):
@@ -384,15 +373,15 @@ def process(self, msg: Message) -> bool:
                         self._charaListMinusDeadPeople.append(perso)
             else:
                 Kernel().worker.removeFrame(self)
-                Logger().warn("Empty Gift List Received")
+                Logger().warning("Empty Gift List Received")
             return True
 
         elif isinstance(msg, PopupWarningClosedMessage):
             return True
 
         elif isinstance(msg, PopupWarningCloseRequestAction):
-            pwcrmsg = PopupWarningCloseRequestMessage()
-            ConnectionsHandler().send(pwcrmsg)
+            msg = PopupWarningCloseRequestMessage()
+            ConnectionsHandler().send(msg)
             return True
 
         elif isinstance(msg, CharacterSelectionAction):

pydofus2/com/ankamagames/dofus/logic/game/common/frames/PlayedCharacterUpdatesFrame.py

@@ -1,5 +1,3 @@
-from datetime import datetime
-from time import perf_counter
 from typing import TYPE_CHECKING
 
 import pydofus2.com.ankamagames.dofus.internalDatacenter.spells.SpellWrapper as swmod
@@ -360,12 +358,7 @@ def process(self, msg: Message) -> bool:
             pass
 
         if isinstance(msg, BasicTimeMessage):
-            btmsg = msg
-            receptionDelay = perf_counter() - btmsg.receptionTime
-            TimeManager().serverTimeLag = (
-                btmsg.timestamp + btmsg.timezoneOffset * 60 * 1000 - datetime.now().timestamp() + receptionDelay
-            )
-            TimeManager().serverUtcTimeLag = btmsg.timestamp - datetime.now().timestamp() + receptionDelay
+            TimeManager().sync_with_server(msg)
             return True
 
         if isinstance(msg, StartupActionsListMessage):
@@ -377,7 +370,7 @@ def process(self, msg: Message) -> bool:
             # for gift in salm.actions:
             #        _items = []
             #    for item in gift.items:
-            #       iw = ItemWrapper.create(0,0,item.objectGID,item.quantity,item.effects,False)
+            #       iw = ItemWrapper.create(0, 0, item.objectGID ,item.quantity, item.effects, False)
             #       _items.append(iw)
             #       obj = {
             #          "uid":gift.uid,