fixcore-engine 0.1.5__tar.gz → 0.1.7__tar.gz

{fixcore_engine-0.1.5/fixcore_engine.egg-info → fixcore_engine-0.1.7}/PKG-INFO

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

{fixcore_engine-0.1.5 → fixcore_engine-0.1.7}/fixcore/session/session.py

@@ -3,10 +3,13 @@
 from __future__ import annotations
 
 import asyncio
+import logging
 import time
 from datetime import datetime, timezone
 from typing import Awaitable, Callable
 
+logger = logging.getLogger(__name__)
+
 from fixcore.application import Application
 from fixcore.log.base import Log
 from fixcore.message.message import Message
@@ -111,17 +114,22 @@ class Session:
 
     async def on_connect(self, send_fn: SendFn) -> None:
         """Called by transport when connection is established."""
+        logger.debug("[%s] on_connect: setting send_fn", self._id)
         self._send_fn = send_fn
         self._last_recv_time = time.monotonic()
 
         if self._reset_on_logon:
+            logger.debug("[%s] on_connect: resetting store", self._id)
             self._store.reset()
 
         self._state = SessionState.LOGON_TIMEOUT
+        logger.debug("[%s] on_connect: starting timer loop", self._id)
         self._heartbeat_task = asyncio.create_task(self._timer_loop())
 
         if self._is_initiator:
+            logger.debug("[%s] on_connect: sending Logon", self._id)
             await self._send_logon()
+            logger.debug("[%s] on_connect: Logon sent", self._id)
 
     async def on_disconnect(self) -> None:
         """Called by transport when connection is lost."""
@@ -304,20 +312,21 @@ class Session:
     # ------------------------------------------------------------------
 
     async def _send_logon(self) -> None:
+        logger.debug("[%s] _send_logon: building Logon message", self._id)
         msg = Message()
         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()
+        logger.debug("[%s] _send_logon: complete", self._id)
 
     async def _send_logout(self, text: str = "") -> None:
         msg = Message()
         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
 
@@ -326,14 +335,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()
@@ -343,7 +350,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:
@@ -373,7 +379,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)
 
     # ------------------------------------------------------------------
@@ -426,7 +431,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)
@@ -434,7 +439,13 @@ 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)
         self._store.incr_next_sender_msg_seq_num()
         self._last_send_time = time.monotonic()
@@ -442,7 +453,11 @@ class Session:
         self._log.on_outgoing(raw.replace(b"\x01", b"|").decode("latin-1"))
 
         if self._send_fn is not None:
+            logger.debug("[%s] _send_message: calling send_fn", self._id)
             await self._send_fn(raw)
+            logger.debug("[%s] _send_message: send_fn returned", self._id)
+        else:
+            logger.warning("[%s] _send_message: send_fn is None — message not sent", self._id)
 
     # ------------------------------------------------------------------
     # Sequence number validation

{fixcore_engine-0.1.5 → fixcore_engine-0.1.7/fixcore_engine.egg-info}/PKG-INFO

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

{fixcore_engine-0.1.5 → fixcore_engine-0.1.7}/pyproject.toml

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