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

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

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

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

@@ -84,6 +84,14 @@ document.addEventListener('DOMContentLoaded', () => {
     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) ────────────────────────────────────────────
@@ -550,6 +558,96 @@ $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';
 
@@ -580,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>
@@ -605,9 +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';
@@ -634,6 +745,7 @@ $id('btn-clear-log').addEventListener('click', () => {
   logEntries = [];
   localStorage.removeItem(LOG_STORAGE_KEY);
   $id('log-entries').innerHTML = '';
+  closeMsgDetail();
 });
 
 // ── Keyboard shortcuts ────────────────────────────────────────────────────
@@ -642,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.2 → fixcore_engine-0.1.4}/fixcore/gui_ui/index.html

@@ -101,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.2 → fixcore_engine-0.1.4}/fixcore/gui_ui/style.css

@@ -315,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;
@@ -324,6 +330,7 @@ body {
   border: 1px solid var(--border);
   border-radius: var(--radius);
   padding: 6px 0;
+  min-width: 0;
 }
 .log-entry {
   display: flex;
@@ -331,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); }
@@ -342,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.2 → fixcore_engine-0.1.4}/fixcore/transport/initiator.py

@@ -71,6 +71,8 @@ class SocketInitiator:
     async def stop(self) -> None:
         """Signal all connect loops to exit and wait for them to finish."""
         self._stop_event.set()
+        for task in self._tasks:
+            task.cancel()
         if self._tasks:
             await asyncio.gather(*self._tasks, return_exceptions=True)
             self._tasks.clear()
@@ -125,10 +127,9 @@ class SocketInitiator:
             try:
                 while not self._stop_event.is_set():
                     try:
-                        data = await asyncio.wait_for(reader.read(4096), timeout=1.0)
-                    except asyncio.TimeoutError:
-                        continue
-                    except (ConnectionResetError, asyncio.IncompleteReadError):
+                        data = await reader.read(4096)
+                    except (ConnectionResetError, asyncio.IncompleteReadError,
+                            asyncio.CancelledError):
                         break
                     if not data:
                         break
@@ -151,9 +152,6 @@ class SocketInitiator:
     async def _interruptible_sleep(self, seconds: float) -> None:
         """Sleep for *seconds* but wake immediately if stop is requested."""
         try:
-            await asyncio.wait_for(
-                asyncio.shield(self._stop_event.wait()),
-                timeout=seconds,
-            )
+            await asyncio.wait_for(self._stop_event.wait(), timeout=seconds)
         except asyncio.TimeoutError:
             pass

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

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

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

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