forexsmartbot 3.3.1__tar.gz → 3.3.2__tar.gz

{forexsmartbot-3.3.1 → forexsmartbot-3.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forexsmartbot
-Version: 3.3.1
+Version: 3.3.2
 Summary: Professional forex trading bot with advanced risk management and strategy plugins
 Author-email: VoxHash <contact@voxhash.dev>
 License: MIT

{forexsmartbot-3.3.1 → forexsmartbot-3.3.2}/forexsmartbot/__init__.py

@@ -1,2 +1,2 @@
 # ForexSmartBot Package
-__version__ = "3.3.1"
+__version__ = "3.3.2"

{forexsmartbot-3.3.1 → forexsmartbot-3.3.2}/forexsmartbot/cloud/__init__.py

@@ -12,6 +12,8 @@ from .companion_api import (
     CompanionActionQueue,
     CompanionPairingStore,
     WebhookNotifier,
+    normalize_cert_pin,
+    resolve_companion_cert_pin,
 )
 from .security import SecurityManager, RateLimiter
 from .api_client import APIClient, WebSocketClient
@@ -29,6 +31,8 @@ __all__ = [
     'CompanionActionQueue',
     'CompanionPairingStore',
     'WebhookNotifier',
+    'normalize_cert_pin',
+    'resolve_companion_cert_pin',
     'SecurityManager',
     'RateLimiter',
     'APIClient',

{forexsmartbot-3.3.1 → forexsmartbot-3.3.2}/forexsmartbot/cloud/companion_api.py

@@ -40,6 +40,32 @@ PAIRING_TTL_SECONDS = 300
 ALLOWED_ACTIONS = frozenset({"start_trading", "stop_trading", "pause_trading"})
 
 
+def normalize_cert_pin(pin: Optional[str]) -> str:
+    """Normalize SPKI pin to ``sha256/...`` form (empty string if unset)."""
+    value = (pin or "").strip()
+    if not value:
+        return ""
+    if value.startswith("sha256/"):
+        return value
+    return f"sha256/{value}"
+
+
+def resolve_companion_cert_pin(explicit: Optional[str] = None) -> str:
+    """
+    Production cert-pin default for pairing QR payloads.
+
+    Order: explicit arg → ``FSB_COMPANION_CERT_PIN`` → ``COMPANION_CERT_PIN``.
+    """
+    import os
+
+    if explicit and str(explicit).strip():
+        return normalize_cert_pin(str(explicit))
+    return normalize_cert_pin(
+        os.getenv("FSB_COMPANION_CERT_PIN") or os.getenv("COMPANION_CERT_PIN") or ""
+    )
+
+
+
 class CompanionActionQueue:
     """Pending high-level companion actions awaiting host approve/reject."""
 
@@ -282,7 +308,7 @@ class CompanionAPI:
         self.require_api_key = require_api_key
         self.allow_control = allow_control
         self.public_base_url = (public_base_url or "").rstrip("/")
-        self.pin_sha256 = (pin_sha256 or "").strip()
+        self.pin_sha256 = resolve_companion_cert_pin(pin_sha256)
         self.url_prefix = url_prefix.rstrip("/") or "/api/v1/companion"
 
         self._portfolio_provider = portfolio_provider or (lambda: {})
@@ -480,7 +506,9 @@ class CompanionAPI:
                 or self.public_base_url
                 or request.host_url.rstrip("/")
             ).rstrip("/")
-            pin = str(data.get("pin_sha256") or self.pin_sha256 or "").strip()
+            pin = resolve_companion_cert_pin(
+                str(data.get("pin_sha256") or self.pin_sha256 or "").strip() or None
+            )
             session = self.pairing_store.create(
                 base_url=base, api_key=self.api_key, pin_sha256=pin or None
             )

{forexsmartbot-3.3.1 → forexsmartbot-3.3.2}/forexsmartbot/cloud/remote_monitor.py

@@ -222,7 +222,13 @@ class RemoteMonitorServer:
 
     def _mount_companion(self) -> None:
         """Mount companion API on the same Flask app."""
-        base = f"http://{self.host}:{self.port}"
+        from .companion_api import resolve_companion_cert_pin
+
+        public = (
+            os.getenv("FSB_PUBLIC_BASE_URL")
+            or os.getenv("COMPANION_PUBLIC_BASE_URL")
+            or f"http://{self.host}:{self.port}"
+        ).rstrip("/")
         self.companion = CompanionAPI(
             app=self.app,
             api_key=self.api_key,
@@ -232,7 +238,8 @@ class RemoteMonitorServer:
             strategies_provider=self._strategies_payload,
             history_provider=lambda name, limit: self._history_payload(name, limit),
             allow_control=False,
-            public_base_url=base,
+            public_base_url=public,
+            pin_sha256=resolve_companion_cert_pin(),
         )
 
     def set_strategy_monitor(self, monitor: Any) -> None:
@@ -387,7 +394,7 @@ class RemoteMonitorServer:
 <body>
     <div class="container">
         <h1>ForexSmartBot Remote Monitor</h1>
-        <p style="color:#aaa;">Strategy health + history charts + companion pairing / approve-reject at <code>/api/v1/companion/*</code></p>
+        <p style="color:#aaa;">Strategy health + history charts + companion pairing / approve-reject at <code>/api/v1/companion/*</code> · multi-host health poll</p>
 
         <div class="status-card">
             <h2>API Key</h2>
@@ -396,6 +403,27 @@ class RemoteMonitorServer:
             <span id="auth-hint" style="color:#aaa;margin-left:8px;"></span>
         </div>
 
+        <div class="status-card">
+            <h2>Multi-Host Monitors</h2>
+            <p style="color:#aaa;">Poll additional remote-monitor hosts (browser-side). Keys stay in this browser session only.</p>
+            <input id="remote-host-url" type="text" placeholder="https://host:8080" style="width:360px;" />
+            <input id="remote-host-key" type="password" placeholder="API key (optional)" style="width:200px;" />
+            <button class="btn" onclick="addRemoteHost()">Add host</button>
+            <button class="btn" onclick="refreshRemoteHosts()">Refresh</button>
+            <table id="remote-hosts-table" style="margin-top:12px;">
+                <thead>
+                    <tr>
+                        <th>Host</th>
+                        <th>Health</th>
+                        <th>Version</th>
+                        <th>Strategies</th>
+                        <th></th>
+                    </tr>
+                </thead>
+                <tbody id="remote-hosts-body"></tbody>
+            </table>
+        </div>
+
         <div class="status-card">
             <h2>Status</h2>
             <div id="status-indicator" class="status-indicator status-disconnected"></div>
@@ -503,6 +531,83 @@ class RemoteMonitorServer:
             updateStatus();
         }
 
+        function loadRemoteHosts() {
+            try {
+                return JSON.parse(localStorage.getItem('fsb_remote_hosts') || '[]');
+            } catch (e) {
+                return [];
+            }
+        }
+
+        function saveRemoteHosts(hosts) {
+            localStorage.setItem('fsb_remote_hosts', JSON.stringify(hosts || []));
+        }
+
+        function addRemoteHost() {
+            const url = document.getElementById('remote-host-url').value.trim().replace(/\\/$/, '');
+            const key = document.getElementById('remote-host-key').value.trim();
+            if (!url) return alert('Enter a host base URL');
+            const hosts = loadRemoteHosts().filter(h => h.url !== url);
+            hosts.push({url: url, key: key});
+            saveRemoteHosts(hosts);
+            document.getElementById('remote-host-url').value = '';
+            document.getElementById('remote-host-key').value = '';
+            refreshRemoteHosts();
+        }
+
+        function removeRemoteHost(url) {
+            saveRemoteHosts(loadRemoteHosts().filter(h => h.url !== url));
+            refreshRemoteHosts();
+        }
+
+        function refreshRemoteHosts() {
+            const hosts = loadRemoteHosts();
+            const tbody = document.getElementById('remote-hosts-body');
+            if (!hosts.length) {
+                tbody.innerHTML = '<tr><td colspan="5" style="color:#888;">No remote hosts — add a monitor URL</td></tr>';
+                return;
+            }
+            tbody.innerHTML = hosts.map(h =>
+                '<tr data-url="' + h.url + '">' +
+                '<td>' + h.url + '</td>' +
+                '<td class="host-health">…</td>' +
+                '<td class="host-version">…</td>' +
+                '<td class="host-strats">…</td>' +
+                '<td><button class="btn btn-stop" onclick="removeRemoteHost(\\'' + h.url.replace(/'/g, '') + '\\')">Remove</button></td>' +
+                '</tr>'
+            ).join('');
+            hosts.forEach(h => {
+                const headers = {'Content-Type': 'application/json'};
+                if (h.key) {
+                    headers['Authorization'] = 'Bearer ' + h.key;
+                    headers['X-API-Key'] = h.key;
+                }
+                const row = tbody.querySelector('tr[data-url="' + h.url + '"]');
+                if (!row) return;
+                fetch(h.url + '/api/v1/health').then(r => r.json()).then(health => {
+                    row.querySelector('.host-health').textContent = health.status || 'ok';
+                    row.querySelector('.host-health').className = 'host-health ' +
+                        (health.status === 'healthy' ? 'health-healthy' : 'health-warning');
+                    row.querySelector('.host-version').textContent = health.version || '—';
+                }).catch(() => {
+                    row.querySelector('.host-health').textContent = 'unreachable';
+                    row.querySelector('.host-health').className = 'host-health health-critical';
+                    row.querySelector('.host-version').textContent = '—';
+                    row.querySelector('.host-strats').textContent = '—';
+                });
+                fetch(h.url + '/api/v1/strategies', {headers: headers}).then(async r => {
+                    if (!r.ok) throw new Error('auth');
+                    return r.json();
+                }).then(data => {
+                    const total = (data.summary && data.summary.total) ||
+                        Object.keys(data.strategies || {}).length;
+                    row.querySelector('.host-strats').textContent = String(total);
+                }).catch(() => {
+                    row.querySelector('.host-strats').textContent = 'n/a';
+                });
+            });
+        }
+
         function statusClass(status) {
             const s = (status || 'unknown').toLowerCase();
             if (s === 'healthy') return 'health-healthy';
@@ -726,7 +831,9 @@ class RemoteMonitorServer:
         const existing = sessionStorage.getItem('fsb_api_key');
         if (existing) document.getElementById('api-key').value = existing;
         setInterval(updateStatus, 3000);
+        setInterval(refreshRemoteHosts, 15000);
         updateStatus();
+        refreshRemoteHosts();
     </script>
 </body>
 </html>

{forexsmartbot-3.3.1 → forexsmartbot-3.3.2}/forexsmartbot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: forexsmartbot
-Version: 3.3.1
+Version: 3.3.2
 Summary: Professional forex trading bot with advanced risk management and strategy plugins
 Author-email: VoxHash <contact@voxhash.dev>
 License: MIT

{forexsmartbot-3.3.1 → forexsmartbot-3.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "forexsmartbot"
-version = "3.3.1"
+version = "3.3.2"
 description = "Professional forex trading bot with advanced risk management and strategy plugins"
 authors = [{name = "VoxHash", email = "contact@voxhash.dev"}]
 license = {text = "MIT"}

{forexsmartbot-3.3.1 → forexsmartbot-3.3.2}/tests/test_companion_q2.py

@@ -2,11 +2,31 @@
 
 from __future__ import annotations
 
-from forexsmartbot.cloud.companion_api import CompanionAPI, WebhookNotifier
+from forexsmartbot.cloud.companion_api import (
+    CompanionAPI,
+    WebhookNotifier,
+    normalize_cert_pin,
+    resolve_companion_cert_pin,
+)
 from forexsmartbot.cloud.remote_monitor import RemoteMonitorServer
 from forexsmartbot.monitoring.strategy_monitor import StrategyMonitor
 
 
+class TestCertPinHelpers:
+    def test_normalize_cert_pin(self):
+        assert normalize_cert_pin("") == ""
+        assert normalize_cert_pin("sha256/ABC=") == "sha256/ABC="
+        assert normalize_cert_pin("ABC=") == "sha256/ABC="
+
+    def test_resolve_from_env(self, monkeypatch):
+        monkeypatch.delenv("FSB_COMPANION_CERT_PIN", raising=False)
+        monkeypatch.delenv("COMPANION_CERT_PIN", raising=False)
+        assert resolve_companion_cert_pin(None) == ""
+        monkeypatch.setenv("FSB_COMPANION_CERT_PIN", "DEADBEEF")
+        assert resolve_companion_cert_pin(None) == "sha256/DEADBEEF"
+        assert resolve_companion_cert_pin("sha256/EXPLICIT=") == "sha256/EXPLICIT="
+
+
 class TestWebhookNotifier:
     def test_rejects_plain_http_non_loopback(self):
         n = WebhookNotifier()
@@ -278,6 +298,34 @@ class TestStrategyHealthDashboard:
         assert "History Charts" in html
         assert "pairing/session" in html
         assert "Pending Companion Actions" in html
+        assert "Multi-Host Monitors" in html
+        assert "fsb_remote_hosts" in html
+
+    def test_companion_pin_from_env_on_monitor(self, monkeypatch):
+        monkeypatch.setenv(
+            "FSB_COMPANION_CERT_PIN",
+            "sha256/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
+        )
+        monkeypatch.setenv("FSB_PUBLIC_BASE_URL", "https://monitor.example")
+        monitor = RemoteMonitorServer(
+            host="127.0.0.1",
+            port=18085,
+            api_key="monitor-test-key-16",
+            require_api_key=True,
+        )
+        assert monitor.companion is not None
+        assert monitor.companion.pin_sha256.startswith("sha256/")
+        assert monitor.companion.public_base_url == "https://monitor.example"
+        client = monitor.app.test_client()
+        created = client.post(
+            "/api/v1/companion/pairing/session",
+            headers={"X-API-Key": "monitor-test-key-16"},
+            json={},
+        )
+        assert created.status_code == 201
+        payload = created.get_json()["qr_payload"]
+        assert payload["base_url"] == "https://monitor.example"
+        assert payload["pin_sha256"].startswith("sha256/")
 
     def test_strategy_history_endpoint(self):
         sm = StrategyMonitor()