fixcore-engine 0.1.6__tar.gz → 0.1.8__tar.gz

{fixcore_engine-0.1.6/fixcore_engine.egg-info → fixcore_engine-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fixcore-engine
-Version: 0.1.6
+Version: 0.1.8
 Summary: Pure Python FIX protocol engine
 Author-email: Aidan Chisholm <aidan.chisholm@gmail.com>
 License: MIT License

{fixcore_engine-0.1.6 → fixcore_engine-0.1.8}/fixcore/session/session.py

@@ -248,6 +248,7 @@ class Session:
             # Acceptor: respond with Logon
             await self._send_logon()
 
+        self._app.from_admin(msg, self._id)
         self._state = SessionState.LOGGED_ON
         self._app.on_logon(self._id)
         self._log.on_event("Logon complete")
@@ -256,6 +257,8 @@ class Session:
         text = msg.get_field_or(TAG_TEXT, "")
         self._log.on_event(f"Received Logout{': ' + text if text else ''}")
 
+        self._app.from_admin(msg, self._id)
+
         if self._state == SessionState.LOGOUT_TIMEOUT:
             # We sent Logout first; counterparty confirmed — clean disconnect
             self._state = SessionState.DISCONNECTED
@@ -317,7 +320,6 @@ class Session:
         msg.header.set(TAG_MSG_TYPE, MSG_LOGON)
         msg.set_field(TAG_ENCRYPT_METHOD, "0")
         msg.set_field(TAG_HEART_BT_INT, str(self._heartbt_int))
-        self._app.to_admin(msg, self._id)
         logger.debug("[%s] _send_logon: calling _send_message", self._id)
         await self._send_message(msg, is_admin=True)
         self._logon_sent_at = time.monotonic()
@@ -328,7 +330,6 @@ class Session:
         msg.header.set(TAG_MSG_TYPE, MSG_LOGOUT)
         if text:
             msg.set_field(TAG_TEXT, text)
-        self._app.to_admin(msg, self._id)
         await self._send_message(msg, is_admin=True)
         self._state = SessionState.LOGOUT_TIMEOUT
 
@@ -337,14 +338,12 @@ class Session:
         msg.header.set(TAG_MSG_TYPE, MSG_HEARTBEAT)
         if test_req_id:
             msg.set_field(TAG_TEST_REQ_ID, test_req_id)
-        self._app.to_admin(msg, self._id)
         await self._send_message(msg, is_admin=True)
 
     async def _send_test_request(self, test_req_id: str) -> None:
         msg = Message()
         msg.header.set(TAG_MSG_TYPE, MSG_TEST_REQUEST)
         msg.set_field(TAG_TEST_REQ_ID, test_req_id)
-        self._app.to_admin(msg, self._id)
         await self._send_message(msg, is_admin=True)
         self._test_req_id = test_req_id
         self._test_req_sent_at = time.monotonic()
@@ -354,7 +353,6 @@ class Session:
         msg.header.set(TAG_MSG_TYPE, MSG_RESEND_REQUEST)
         msg.set_field(TAG_BEGIN_SEQ_NO, str(begin_seq))
         msg.set_field(TAG_END_SEQ_NO, str(end_seq))
-        self._app.to_admin(msg, self._id)
         await self._send_message(msg, is_admin=True)
 
     async def _send_sequence_reset(self, new_seq_no: int, gap_fill: bool = False) -> None:
@@ -384,7 +382,6 @@ class Session:
             msg.set_field(TAG_SESSION_REJECT_REASON, str(reason))
         if text:
             msg.set_field(TAG_TEXT, text)
-        self._app.to_admin(msg, self._id)
         await self._send_message(msg, is_admin=True)
 
     # ------------------------------------------------------------------
@@ -437,7 +434,7 @@ class Session:
     # ------------------------------------------------------------------
 
     async def _send_message(self, msg: Message, *, is_admin: bool) -> None:
-        """Stamp header, store, log, and transmit *msg*."""
+        """Stamp header, call app callback, store, log, and transmit *msg*."""
         seq_num = self._store.next_sender_msg_seq_num()
         msg.header.set(TAG_BEGIN_STRING, self._id.begin_string)
         msg.header.set(TAG_SENDER_COMP_ID, self._id.sender_comp_id)
@@ -445,6 +442,11 @@ class Session:
         msg.header.set(TAG_MSG_SEQ_NUM, str(seq_num))
         msg.header.set(TAG_SENDING_TIME, _utc_timestamp())
 
+        if is_admin:
+            self._app.to_admin(msg, self._id)
+        else:
+            self._app.to_app(msg, self._id)
+
         raw = msg.encode()
         logger.debug("[%s] _send_message: seq=%s len=%d", self._id, seq_num, len(raw))
         self._store.set(seq_num, raw)

{fixcore_engine-0.1.6 → fixcore_engine-0.1.8/fixcore_engine.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fixcore-engine
-Version: 0.1.6
+Version: 0.1.8
 Summary: Pure Python FIX protocol engine
 Author-email: Aidan Chisholm <aidan.chisholm@gmail.com>
 License: MIT License

{fixcore_engine-0.1.6 → fixcore_engine-0.1.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fixcore-engine"
-version = "0.1.6"
+version = "0.1.8"
 description = "Pure Python FIX protocol engine"
 readme = "README.md"
 license = { file = "LICENSE" }