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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fixcore-engine
-Version: 0.1.1
+Version: 0.1.3
 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.3}/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.3}/fixcore/gui_ui/app.js

@@ -76,12 +76,22 @@ document.addEventListener('DOMContentLoaded', () => {
   connectWS();
   apiCall('get_version').then(v => { $id('version').textContent = v; });
   startPolling();
+  loadLog();
+  rebuildLog();
   updateAutoClordidVisibility();
   updateClordidPreview();
   $id('chk-auto-clordid').addEventListener('change', () => {
     updateClordidPreview();
   });
   $id('inp-clordid-prefix').addEventListener('input', updateClordidPreview);
+
+  $id('btn-close-detail').addEventListener('click', closeMsgDetail);
+  $id('log-entries').addEventListener('click', e => {
+    const row = e.target.closest('.log-entry');
+    if (!row || !row._logEntry) return;
+    if (row === selectedLogRow) { closeMsgDetail(); return; }
+    showMsgDetail(row, row._logEntry);
+  });
 });
 
 // ── Polling (seq nums + state) ────────────────────────────────────────────
@@ -153,6 +163,7 @@ function dotClass(state) {
 function selectSession(key) {
   activeSid = key;
   refreshSessions();
+  rebuildLog();
 }
 
 function renderSessionDetail(s) {
@@ -293,6 +304,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 +362,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'},
@@ -521,11 +558,115 @@ $id('paste-fix-input').addEventListener('keydown', e => {
   }
 });
 
+// ── FIX tag reference ─────────────────────────────────────────────────────
+const FIX_TAG_NAMES = {
+  1:'Account', 6:'AvgPx', 7:'BeginSeqNo', 8:'BeginString', 9:'BodyLength',
+  10:'CheckSum', 11:'ClOrdID', 14:'CumQty', 15:'Currency', 16:'EndSeqNo',
+  31:'LastPx', 32:'LastQty',
+  17:'ExecID', 18:'ExecInst', 20:'ExecTransType', 21:'HandlInst',
+  34:'MsgSeqNum', 35:'MsgType', 36:'NewSeqNo', 37:'OrderID', 38:'OrderQty',
+  39:'OrdStatus', 40:'OrdType', 41:'OrigClOrdID', 43:'PossDupFlag',
+  44:'Price', 45:'RefSeqNum', 49:'SenderCompID', 50:'SenderSubID',
+  52:'SendingTime', 54:'Side', 55:'Symbol', 56:'TargetCompID',
+  57:'TargetSubID', 58:'Text', 60:'TransactTime', 97:'PossResend',
+  98:'EncryptMethod', 108:'HeartBtInt', 110:'MinQty', 111:'MaxFloor',
+  112:'TestReqID', 114:'LocateReqd', 122:'OrigSendingTime', 123:'GapFillFlag',
+  126:'ExpireTime', 131:'QuoteReqID', 140:'PrevClosePx', 146:'NoRelatedSym',
+  150:'ExecType', 151:'LeavesQty', 167:'SecurityType', 200:'MaturityMonthYear',
+  202:'StrikePrice', 207:'SecurityExchange', 262:'MDReqID',
+  263:'SubscriptionRequestType', 264:'MarketDepth', 267:'NoMDEntryTypes',
+  268:'NoMDEntries', 269:'MDEntryType', 270:'MDEntryPx', 271:'MDEntrySize',
+};
+
+const FIX_ENUM_VALUES = {
+  35: {'0':'Heartbeat','1':'TestRequest','2':'ResendRequest','3':'Reject',
+       '4':'SequenceReset','5':'Logout','8':'ExecutionReport',
+       '9':'OrderCancelReject','A':'Logon','D':'NewOrderSingle',
+       'F':'OrderCancelRequest','G':'OrderCancelReplaceRequest',
+       'H':'OrderStatusRequest','V':'MarketDataRequest',
+       'W':'MarketDataSnapshot','X':'MarketDataIncremental','Y':'MarketDataRequestReject'},
+  39: {'0':'New','1':'PartiallyFilled','2':'Filled','3':'DoneForDay',
+       '4':'Canceled','5':'Replaced','6':'PendingCancel','7':'Stopped',
+       '8':'Rejected','9':'Suspended','A':'PendingNew','C':'Expired'},
+  40: {'1':'Market','2':'Limit','3':'Stop','4':'StopLimit','5':'MarketOnClose'},
+  54: {'1':'Buy','2':'Sell','3':'BuyMinus','4':'SellPlus','5':'SellShort','6':'SellShortExempt'},
+  98: {'0':'None','1':'Value','2':'DES','3':'PKCS','4':'PGP','5':'PCSDSS','6':'PEM'},
+  150:{'0':'New','1':'PartialFill','2':'Fill','3':'DoneForDay','4':'Canceled',
+       '5':'Replace','6':'PendingCancel','7':'Stopped','8':'Rejected',
+       'D':'Restated','E':'Trade','F':'TradeCorrect','G':'TradeCancel','H':'OrderStatus'},
+};
+
+function fixTagName(tag) { return FIX_TAG_NAMES[parseInt(tag)] || ''; }
+function fixEnumVal(tag, val) {
+  const map = FIX_ENUM_VALUES[parseInt(tag)];
+  return map ? (map[val] || val) : val;
+}
+
+// ── Message detail panel ──────────────────────────────────────────────────
+let selectedLogRow = null;
+
+function showMsgDetail(row, entry) {
+  if (selectedLogRow) selectedLogRow.classList.remove('selected');
+  selectedLogRow = row;
+  row.classList.add('selected');
+
+  const content = $id('msg-detail-content');
+  content.innerHTML = '';
+
+  // Meta info
+  const meta = document.createElement('div');
+  meta.className = 'msg-detail-meta';
+  meta.innerHTML = `<strong>${dirArrow(entry.dir)} ${entry.dir.toUpperCase()}</strong>
+    &nbsp;${escHtml(entry.time)}
+    &nbsp;<span title="${escHtml(entry.sid)}">${escHtml(shortSid(entry.sid))}</span>`;
+  content.appendChild(meta);
+
+  // Parse fields
+  entry.raw.split('|').filter(Boolean).forEach(part => {
+    const eq = part.indexOf('=');
+    if (eq < 1) return;
+    const tag = part.slice(0, eq).trim();
+    const val = part.slice(eq + 1);
+    const name = fixTagName(tag);
+    const display = fixEnumVal(tag, val);
+
+    const row = document.createElement('div');
+    row.className = 'msg-detail-row';
+    row.innerHTML =
+      `<span class="detail-tag">${escHtml(tag)}</span>` +
+      `<span class="detail-name" title="${escHtml(name)}">${escHtml(name)}</span>` +
+      `<span class="detail-val" title="${escHtml(val)}">${escHtml(display)}</span>`;
+    content.appendChild(row);
+  });
+
+  $id('msg-detail-panel').classList.remove('hidden');
+}
+
+function closeMsgDetail() {
+  if (selectedLogRow) { selectedLogRow.classList.remove('selected'); selectedLogRow = null; }
+  $id('msg-detail-panel').classList.add('hidden');
+}
+
+
 // ── 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);
 }
 
@@ -537,6 +678,7 @@ function appendLogRow(entry) {
   const row = document.createElement('div');
   row.className = `log-entry ${entry.dir}`;
   row.dataset.dir = entry.dir;
+  row._logEntry = entry;
   row.innerHTML = `
     <span class="log-time">${escHtml(entry.time)}</span>
     <span class="log-dir">${dirArrow(entry.dir)}</span>
@@ -562,8 +704,21 @@ function shortSid(sid) {
     : sid.slice(0, 12);
 }
 
+const SESSION_MSG_TYPES = new Set(['0','1','2','3','4','5','A']);
+
+function getMsgType(raw) {
+  const m = raw.match(/\b35=([^|]+)/);
+  return m ? m[1].trim() : null;
+}
+
 function matchesFilter(entry) {
+  if (activeSid && entry.sid !== activeSid) return false;
   if (logFilter === 'all')   return true;
+  if (logFilter === 'app') {
+    if (entry.dir === 'evt') return false;
+    const mt = getMsgType(entry.raw);
+    return mt !== null && !SESSION_MSG_TYPES.has(mt);
+  }
   if (logFilter === 'in')    return entry.dir === 'in';
   if (logFilter === 'out')   return entry.dir === 'out';
   if (logFilter === 'event') return entry.dir === 'evt';
@@ -588,7 +743,9 @@ $id('panel-log').querySelectorAll('.filter-btn').forEach(btn => {
 
 $id('btn-clear-log').addEventListener('click', () => {
   logEntries = [];
+  localStorage.removeItem(LOG_STORAGE_KEY);
   $id('log-entries').innerHTML = '';
+  closeMsgDetail();
 });
 
 // ── Keyboard shortcuts ────────────────────────────────────────────────────
@@ -597,6 +754,7 @@ document.addEventListener('keydown', e => {
     $id('modal-overlay').classList.add('hidden');
     $id('paste-modal-overlay').classList.add('hidden');
     editMode = false; editOldKey = null;
+    closeMsgDetail();
   }
   if ((e.ctrlKey || e.metaKey) && e.key === 'n') {
     e.preventDefault();

{fixcore_engine-0.1.1 → fixcore_engine-0.1.3}/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 -->
@@ -95,13 +101,23 @@
           <span class="panel-title">Message Log</span>
           <div class="log-filters">
             <button class="filter-btn active" data-filter="all">All</button>
+            <button class="filter-btn" data-filter="app">App</button>
             <button class="filter-btn" data-filter="out">▶ Out</button>
             <button class="filter-btn" data-filter="in">◀ In</button>
             <button class="filter-btn" data-filter="event">Events</button>
           </div>
           <button class="btn btn-secondary btn-sm" id="btn-clear-log">Clear</button>
         </div>
-        <div id="log-entries" class="log-entries"></div>
+        <div class="log-body">
+          <div id="log-entries" class="log-entries"></div>
+          <aside id="msg-detail-panel" class="msg-detail-panel hidden">
+            <div class="msg-detail-header">
+              <span class="msg-detail-title">Message Detail</span>
+              <button id="btn-close-detail" class="btn-close-detail">×</button>
+            </div>
+            <div id="msg-detail-content" class="msg-detail-content"></div>
+          </aside>
+        </div>
       </section>
     </main>
   </div>

{fixcore_engine-0.1.1 → fixcore_engine-0.1.3}/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;
@@ -302,6 +315,12 @@ body {
   border-color: var(--accent);
   color: #fff;
 }
+.log-body {
+  display: flex;
+  flex: 1;
+  gap: 0;
+  overflow: hidden;
+}
 .log-entries {
   flex: 1;
   overflow-y: auto;
@@ -311,6 +330,7 @@ body {
   border: 1px solid var(--border);
   border-radius: var(--radius);
   padding: 6px 0;
+  min-width: 0;
 }
 .log-entry {
   display: flex;
@@ -318,8 +338,10 @@ body {
   padding: 2px 10px;
   border-bottom: 1px solid transparent;
   line-height: 1.5;
+  cursor: pointer;
 }
 .log-entry:hover { background: var(--bg2); }
+.log-entry.selected { background: var(--bg3); outline: 1px solid var(--accent); }
 .log-entry.in  .log-dir { color: var(--in-color); }
 .log-entry.out .log-dir { color: var(--out-color); }
 .log-entry.evt .log-dir { color: var(--event-color); }
@@ -329,6 +351,71 @@ body {
 .log-sid  { color: var(--text-dim); flex-shrink: 0; max-width: 120px; overflow: hidden; text-overflow: ellipsis; }
 .log-msg  { color: var(--text); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 
+/* ── Message detail panel ─────────────────────────────────────────────── */
+.msg-detail-panel {
+  width: 320px;
+  flex-shrink: 0;
+  border-left: 1px solid var(--border);
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  background: var(--bg);
+  margin-left: 8px;
+  border-radius: var(--radius);
+  border: 1px solid var(--border);
+}
+.msg-detail-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 6px 10px;
+  border-bottom: 1px solid var(--border);
+  flex-shrink: 0;
+  background: var(--bg2);
+}
+.msg-detail-title {
+  font-size: 11px;
+  font-weight: 600;
+  text-transform: uppercase;
+  letter-spacing: .08em;
+  color: var(--text-dim);
+}
+.btn-close-detail {
+  background: none;
+  border: none;
+  color: var(--text-dim);
+  cursor: pointer;
+  font-size: 16px;
+  padding: 0 2px;
+  line-height: 1;
+}
+.btn-close-detail:hover { color: var(--text); }
+.msg-detail-content {
+  flex: 1;
+  overflow-y: auto;
+  padding: 4px 0;
+}
+.msg-detail-meta {
+  font-size: 11px;
+  color: var(--text-dim);
+  padding: 4px 10px 6px;
+  border-bottom: 1px solid var(--border);
+  margin-bottom: 2px;
+}
+.msg-detail-meta strong { color: var(--text); }
+.msg-detail-row {
+  display: grid;
+  grid-template-columns: 42px minmax(0,1fr) minmax(0,1.4fr);
+  gap: 0 6px;
+  padding: 2px 10px;
+  font-size: 11px;
+  line-height: 1.6;
+}
+.msg-detail-row:hover { background: var(--bg2); }
+.detail-tag  { color: var(--text-dim); font-variant-numeric: tabular-nums; }
+.detail-name { color: var(--accent); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.detail-val  { color: var(--text); word-break: break-all; }
+
 /* ── Buttons ─────────────────────────────────────────────────────────── */
 .btn {
   font-family: var(--font);

{fixcore_engine-0.1.1 → fixcore_engine-0.1.3}/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.3/fixcore_engine.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fixcore-engine
-Version: 0.1.1
+Version: 0.1.3
 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.3}/pyproject.toml

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