fixcore-engine 0.1.1__tar.gz → 0.1.2__tar.gz

{fixcore_engine-0.1.1/fixcore_engine.egg-info → fixcore_engine-0.1.2}/PKG-INFO

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

{fixcore_engine-0.1.1 → fixcore_engine-0.1.2}/fixcore/gui.py

@@ -224,6 +224,8 @@ async def _dispatch(method: str, body: dict[str, Any]) -> Any:
         )
     if method == "update_session":
         return await _update_session(body.get("old_key", ""), body)
+    if method == "stop":
+        return await _stop(body.get("sid_key", ""))
     return {"ok": False, "error": f"Unknown method: {method!r}"}
 
 
@@ -377,24 +379,37 @@ async def _logon(sid_key: str) -> dict[str, Any]:
 
 
 async def _logout(sid_key: str) -> dict[str, Any]:
+    """Graceful FIX logout — sends Logout message and disables auto-reconnect."""
+    entry = _sessions.get(sid_key)
+    if entry is None:
+        return {"ok": False, "error": "Unknown session"}
+    transport = entry.get("transport")
+    if transport is None:
+        return {"ok": False, "error": "No transport"}
+    try:
+        if isinstance(transport, SocketInitiator):
+            await transport.logout()
+        else:
+            session = next(iter(transport.sessions.values()), None)
+            if session and session.is_logged_on:
+                await session.send_logout()
+        entry["started"] = False
+    except Exception as exc:
+        return {"ok": False, "error": str(exc)}
+    return {"ok": True}
+
+
+async def _stop(sid_key: str) -> dict[str, Any]:
+    """Hard stop — kills the transport immediately without sending FIX Logout."""
     entry = _sessions.get(sid_key)
     if entry is None:
         return {"ok": False, "error": "Unknown session"}
     transport = entry.get("transport")
     if transport is None:
         return {"ok": False, "error": "No transport"}
-    session = next(iter(transport.sessions.values()), None)
-    if session is None:
-        return {"ok": False, "error": "No session"}
-    if not session.is_logged_on:
-        try:
-            await transport.stop()
-            entry["started"] = False
-        except Exception as exc:
-            return {"ok": False, "error": str(exc)}
-        return {"ok": True}
     try:
-        await session.send_logout()
+        await transport.stop()
+        entry["started"] = False
     except Exception as exc:
         return {"ok": False, "error": str(exc)}
     return {"ok": True}

{fixcore_engine-0.1.1 → fixcore_engine-0.1.2}/fixcore/gui_ui/app.js

@@ -76,6 +76,8 @@ document.addEventListener('DOMContentLoaded', () => {
   connectWS();
   apiCall('get_version').then(v => { $id('version').textContent = v; });
   startPolling();
+  loadLog();
+  rebuildLog();
   updateAutoClordidVisibility();
   updateClordidPreview();
   $id('chk-auto-clordid').addEventListener('change', () => {
@@ -153,6 +155,7 @@ function dotClass(state) {
 function selectSession(key) {
   activeSid = key;
   refreshSessions();
+  rebuildLog();
 }
 
 function renderSessionDetail(s) {
@@ -293,6 +296,14 @@ $id('btn-logout').addEventListener('click', () => {
   });
 });
 
+$id('btn-stop').addEventListener('click', () => {
+  if (!activeSid) return;
+  apiCall('stop', { sid_key: activeSid }).then(res => {
+    if (!res.ok) showToast('Stop: ' + res.error, 'error');
+    else { showToast('Session stopped'); refreshSessions(); }
+  });
+});
+
 $id('btn-edit').addEventListener('click', () => {
   if (!activeSid) return;
   openEditModal(activeSid);
@@ -343,6 +354,24 @@ function generateClordId() {
   return prefix + String(clordIdSeq).padStart(6, '0');
 }
 
+// ── Send panel collapse ───────────────────────────────────────────────────
+const SEND_COLLAPSED_KEY = 'fixcore_send_collapsed';
+
+function setSendCollapsed(collapsed) {
+  $id('panel-send').classList.toggle('panel-send-collapsed', collapsed);
+  try { localStorage.setItem(SEND_COLLAPSED_KEY, collapsed ? '1' : '0'); } catch (_) {}
+}
+
+$id('btn-toggle-send').addEventListener('click', () => {
+  const collapsed = !$id('panel-send').classList.contains('panel-send-collapsed');
+  setSendCollapsed(collapsed);
+});
+
+// Restore collapse state on load
+try {
+  if (localStorage.getItem(SEND_COLLAPSED_KEY) === '1') setSendCollapsed(true);
+} catch (_) {}
+
 // ── Message builder ───────────────────────────────────────────────────────
 const MSG_TYPE_DEFAULTS = {
   'D': [{tag:'11',value:'ORD0001'},{tag:'55',value:'AAPL'},{tag:'54',value:'1'},
@@ -522,10 +551,24 @@ $id('paste-fix-input').addEventListener('keydown', e => {
 });
 
 // ── Message log ───────────────────────────────────────────────────────────
+const LOG_STORAGE_KEY = 'fixcore_log';
+
+function saveLog() {
+  try { localStorage.setItem(LOG_STORAGE_KEY, JSON.stringify(logEntries)); } catch (_) {}
+}
+
+function loadLog() {
+  try {
+    const raw = localStorage.getItem(LOG_STORAGE_KEY);
+    if (raw) logEntries = JSON.parse(raw);
+  } catch (_) {}
+}
+
 function addLogEntry(dir, sid, raw) {
   const entry = { dir, sid, raw, time: nowStr() };
   logEntries.push(entry);
   if (logEntries.length > 2000) logEntries.shift();
+  saveLog();
   appendLogRow(entry);
 }
 
@@ -563,6 +606,7 @@ function shortSid(sid) {
 }
 
 function matchesFilter(entry) {
+  if (activeSid && entry.sid !== activeSid) return false;
   if (logFilter === 'all')   return true;
   if (logFilter === 'in')    return entry.dir === 'in';
   if (logFilter === 'out')   return entry.dir === 'out';
@@ -588,6 +632,7 @@ $id('panel-log').querySelectorAll('.filter-btn').forEach(btn => {
 
 $id('btn-clear-log').addEventListener('click', () => {
   logEntries = [];
+  localStorage.removeItem(LOG_STORAGE_KEY);
   $id('log-entries').innerHTML = '';
 });
 

{fixcore_engine-0.1.1 → fixcore_engine-0.1.2}/fixcore/gui_ui/index.html

@@ -43,6 +43,7 @@
           <div class="detail-actions">
             <button class="btn btn-primary" id="btn-logon">Logon</button>
             <button class="btn btn-warn" id="btn-logout">Logout</button>
+            <button class="btn btn-secondary" id="btn-stop">Stop</button>
             <button class="btn btn-secondary" id="btn-reset">Reset SeqNums</button>
             <button class="btn btn-secondary" id="btn-edit">Edit</button>
             <button class="btn btn-danger" id="btn-remove">Remove</button>
@@ -52,7 +53,11 @@
 
       <!-- Send message panel -->
       <section class="panel" id="panel-send">
-        <div class="panel-title">Send Message</div>
+        <div class="panel-title panel-title-collapsible" id="btn-toggle-send">
+          <span>Send Message</span>
+          <span class="collapse-chevron" id="send-chevron">▲</span>
+        </div>
+        <div id="panel-send-body">
         <div class="send-row">
           <label class="send-label">MsgType</label>
           <select id="msg-type-select" class="select-msg-type">
@@ -87,6 +92,7 @@
           <button class="btn btn-secondary" id="btn-add-field">+ Add Field</button>
           <button class="btn btn-primary" id="btn-send">Send Message</button>
         </div>
+        </div><!-- /panel-send-body -->
       </section>
 
       <!-- Message log -->

{fixcore_engine-0.1.1 → fixcore_engine-0.1.2}/fixcore/gui_ui/style.css

@@ -138,6 +138,19 @@ body {
   color: var(--text-dim);
   margin-bottom: 10px;
 }
+.panel-title-collapsible {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  cursor: pointer;
+  user-select: none;
+  margin-bottom: 10px;
+}
+.panel-title-collapsible:hover { color: var(--text); }
+.collapse-chevron { font-size: 10px; transition: transform .2s; }
+.panel-send-collapsed .collapse-chevron { transform: rotate(180deg); }
+.panel-send-collapsed #panel-send-body { display: none; }
+.panel-send-collapsed { padding-bottom: 14px; }
 .placeholder {
   color: var(--text-dim);
   font-style: italic;

{fixcore_engine-0.1.1 → fixcore_engine-0.1.2}/fixcore/transport/initiator.py

@@ -42,6 +42,7 @@ class SocketInitiator:
         self._sessions: dict[SessionID, Session] = {}
         self._tasks: list[asyncio.Task[None]] = []
         self._stop_event = asyncio.Event()
+        self._no_reconnect = asyncio.Event()
 
         for sid in settings.session_ids:
             conn_type = settings.get_or(sid, "ConnectionType", "initiator").lower()
@@ -59,6 +60,7 @@ class SocketInitiator:
     async def start(self) -> None:
         """Launch a connect-loop task for each configured initiator session."""
         self._stop_event.clear()
+        self._no_reconnect.clear()
         for sid, session in self._sessions.items():
             task = asyncio.create_task(
                 self._connect_loop(sid, session),
@@ -73,6 +75,17 @@ class SocketInitiator:
             await asyncio.gather(*self._tasks, return_exceptions=True)
             self._tasks.clear()
 
+    async def logout(self) -> None:
+        """Send FIX Logout for all active sessions and disable auto-reconnect.
+
+        The connect loop will exit cleanly after the connection drops rather
+        than sleeping and retrying.  Call :meth:`start` to reconnect later.
+        """
+        self._no_reconnect.set()
+        for session in self._sessions.values():
+            if session.is_logged_on:
+                await session.send_logout()
+
     async def __aenter__(self) -> "SocketInitiator":
         await self.start()
         return self
@@ -132,7 +145,7 @@ class SocketInitiator:
                     pass
                 framer.reset()
 
-            if not self._stop_event.is_set():
+            if not self._stop_event.is_set() and not self._no_reconnect.is_set():
                 await self._interruptible_sleep(reconnect)
 
     async def _interruptible_sleep(self, seconds: float) -> None:

{fixcore_engine-0.1.1 → fixcore_engine-0.1.2/fixcore_engine.egg-info}/PKG-INFO

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

{fixcore_engine-0.1.1 → fixcore_engine-0.1.2}/pyproject.toml

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