Spaces:

Really-amin
/

Datasourceforcryptocurrency

Paused

App Files Files Community

Really-amin commited on Nov 18

Commit

68aff21

verified ·

1 Parent(s): 69bc051

Upload 40 files

Browse files

Files changed (3) hide show

admin.html +39 -6
static/js/apiClient.js +9 -19
static/js/wsClient.js +29 -30

admin.html CHANGED Viewed

@@ -9,14 +9,25 @@
     <link rel="stylesheet" href="static/css/dashboard.css" />
     <link rel="stylesheet" href="static/css/pro-dashboard.css" />
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/chart.umd.min.js" defer></script>
 </head>
 <body data-theme="dark">
     <!-- ===== تنظیم بک‌اند (اسکریپت) ===== -->
     <script>
         // اگر بک‌اندت روی Space دیگه‌ای هست اینجا عوض کن
         // مثال: window.BACKEND_URL = 'https://aminmckee-crypto-intelligence.hf.space';
-        // اگر بک‌اند و داشبورد در یک Space هستن → این خط رو حذف یا کامنت کن
-        window.BACKEND_URL = 'https://aminmckee-crypto-intelligence.hf.space';
     </script>
     <div class="app-shell">
@@ -93,11 +104,33 @@
                     <p class="text-muted">Live market data, AI-powered sentiment analysis, and comprehensive crypto intelligence</p>
                 </div>
                 <div class="status-group">
                     <div class="status-pill" data-api-health data-state="warn">
-                        <span class="status-dot"></span><span>checking</span>
-                    </div>
                     <div class="status-pill" data-ws-status data-state="warn">
-                        <span class="status-dot"></span><span>connecting</span>
                     </div>
                 </div>
             </header>
@@ -521,4 +554,4 @@
     <!-- Load App JS as ES6 Module -->
     <script type="module" src="static/js/app.js"></script>
 </body>
-</html>

     <link rel="stylesheet" href="static/css/dashboard.css" />
     <link rel="stylesheet" href="static/css/pro-dashboard.css" />
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/chart.umd.min.js" defer></script>
+    <!-- SVG status icon tweaks -->
+    <style>
+        .status-pill .status-icon {
+            margin-inline: 0.35rem;
+            flex-shrink: 0;
+        }
+        .status-pill .status-label {
+            white-space: nowrap;
+        }
+    </style>
 </head>
 <body data-theme="dark">
     <!-- ===== تنظیم بک‌اند (اسکریپت) ===== -->
     <script>
         // اگر بک‌اندت روی Space دیگه‌ای هست اینجا عوض کن
         // مثال: window.BACKEND_URL = 'https://aminmckee-crypto-intelligence.hf.space';
+        // الان تنظیم شده روی Space فعلی داده‌ها:
+        window.BACKEND_URL = 'https://really-amin-datasourceforcryptocurrency.hf.space';
     </script>
     <div class="app-shell">
                     <p class="text-muted">Live market data, AI-powered sentiment analysis, and comprehensive crypto intelligence</p>
                 </div>
                 <div class="status-group">
+                    <!-- API Health with SVG icon -->
                     <div class="status-pill" data-api-health data-state="warn">
+                        <span class="status-dot"></span>
+                        <svg class="status-icon" width="14" height="14" viewBox="0 0 24 24" aria-hidden="true">
+                            <path d="M4 7h16M4 12h10M4 17h7"
+                                  stroke="currentColor"
+                                  stroke-width="2"
+                                  stroke-linecap="round"
+                                  stroke-linejoin="round" />
+                        </svg>
+                        <span class="status-label">checking</span>
+                    </div>
+                    <!-- WebSocket Status with SVG icon -->
                     <div class="status-pill" data-ws-status data-state="warn">
+                        <span class="status-dot"></span>
+                        <svg class="status-icon" width="14" height="14" viewBox="0 0 24 24" aria-hidden="true">
+                            <path d="M4 5h16v6H4z"
+                                  stroke="currentColor"
+                                  stroke-width="2"
+                                  fill="none"
+                                  stroke-linejoin="round" />
+                            <path d="M8 15h8M10 19h4"
+                                  stroke="currentColor"
+                                  stroke-width="2"
+                                  stroke-linecap="round" />
+                        </svg>
+                        <span class="status-label">connecting</span>
                     </div>
                 </div>
             </header>
     <!-- Load App JS as ES6 Module -->
     <script type="module" src="static/js/app.js"></script>
 </body>
+</html>

static/js/apiClient.js CHANGED Viewed

@@ -2,26 +2,15 @@ const DEFAULT_TTL = 60 * 1000; // 1 minute cache
 class ApiClient {
     constructor() {
-        // ==== اصلاح هوشمندانه آدرس بک‌اند ====
-        // ۱. اگر دستی BACKEND_URL تعریف شده باشه (از HTML)
-        // ۲. اگر روی HF Space هستیم و بک‌اند هم همونه → خودکار
-        // ۳. در غیر این صورت → بک‌اند معروف و همیشه زنده
-        this.baseURL =
-            (typeof window.BACKEND_URL === 'string' && window.BACKEND_URL.trim() !== ''
-                ? window.BACKEND_URL.trim().replace(/\/$/, '')
-                : null) ||
-            (window.location.origin.includes('hf.space')
-                ? window.location.origin.replace(/\/$/, '')
-                : null) ||
-            'https://aminmckee-crypto-intelligence.hf.space';
-        // تضمین نهایی: اگر به هر دلیلی خالی بود
-        if (!this.baseURL || this.baseURL === 'null' || this.baseURL === '') {
-            this.baseURL = 'https://aminmckee-crypto-intelligence.hf.space';
         }
-        console.log('[ApiClient] Backend URL:', this.baseURL);
-        // ==== پایان اصلاح ====
         this.cache = new Map();
         this.requestLogs = [];
@@ -79,7 +68,8 @@ class ApiClient {
         }
         const started = performance.now();
-        const randomId = (window.crypto && window.crypto.randomUUID && window.crypto.randomUUID()) || `${Date.now()}-${Math.random()}`;
         const entry = {
             id: randomId,
             method,

 class ApiClient {
     constructor() {
+        // ==== آدرس صحیح بک‌اند شما (Really-amin) ====
+        this.baseURL = 'https://really-amin-datasourceforcryptocurrency.hf.space';
+        // اگر بعداً بخوای دستی عوض کنی، از HTML استفاده کن
+        if (typeof window.BACKEND_URL === 'string' && window.BACKEND_URL.trim()) {
+            this.baseURL = window.BACKEND_URL.trim().replace(/\/$/, '');
         }
+        console.log('[ApiClient] Using Backend:', this.baseURL);
         this.cache = new Map();
         this.requestLogs = [];
         }
         const started = performance.now();
+        const randomId = (window.crypto && window.crypto.randomUUID && window.crypto.randomUUID())
+            || `${Date.now()}-${Math.random()}`;
         const entry = {
             id: randomId,
             method,

static/js/wsClient.js CHANGED Viewed

@@ -11,11 +11,12 @@ class WSClient {
         this.shouldReconnect = true;
     }
     get url() {
-        const { protocol, host } = window.location;
-        const wsProtocol = protocol === 'https:' ? 'wss:' : 'ws:';
-        return `${wsProtocol}//${host}/ws`;
     }
     logEvent(event) {
         const entry = { ...event, time: new Date().toISOString() };
@@ -35,21 +36,21 @@ class WSClient {
     }
     subscribe(type, callback) {
-        if (!this.typeSubscribers.has(type)) {
-            this.typeSubscribers.set(type, new Set());
-        }
         const set = this.typeSubscribers.get(type);
         set.add(callback);
         return () => set.delete(callback);
     }
     updateStatus(newStatus) {
-        this.status = newStatus;
-        this.statusSubscribers.forEach((cb) => cb(newStatus));
     }
     connect() {
-        if (this.socket && (this.status === 'connecting' || this.status === 'connected')) {
             return;
         }
@@ -57,26 +58,27 @@ class WSClient {
         this.socket = new WebSocket(this.url);
         this.logEvent({ type: 'status', status: 'connecting' });
-        this.socket.addEventListener('open', () => {
             this.backoff = 1000;
             this.updateStatus('connected');
             this.logEvent({ type: 'status', status: 'connected' });
-        });
-        this.socket.addEventListener('message', (event) => {
             try {
                 const data = JSON.parse(event.data);
                 this.logEvent({ type: 'message', messageType: data.type || 'unknown' });
-                this.globalSubscribers.forEach((cb) => cb(data));
                 if (data.type && this.typeSubscribers.has(data.type)) {
-                    this.typeSubscribers.get(data.type).forEach((cb) => cb(data));
                 }
-            } catch (error) {
-                console.error('WS message parse error', error);
             }
-        });
-        this.socket.addEventListener('close', () => {
             this.updateStatus('disconnected');
             this.logEvent({ type: 'status', status: 'disconnected' });
             if (this.shouldReconnect) {
@@ -84,22 +86,17 @@ class WSClient {
                 this.backoff = Math.min(this.backoff * 2, this.maxBackoff);
                 setTimeout(() => this.connect(), delay);
             }
-        });
-        this.socket.addEventListener('error', (error) => {
-            console.error('WebSocket error', error);
-            this.logEvent({ type: 'error', details: error.message || 'unknown' });
-            if (this.socket) {
-                this.socket.close();
-            }
-        });
     }
     disconnect() {
         this.shouldReconnect = false;
-        if (this.socket) {
-            this.socket.close();
-        }
     }
     getEvents() {
@@ -108,4 +105,6 @@ class WSClient {
 }
 const wsClient = new WSClient();
-export default wsClient;

         this.shouldReconnect = true;
     }
+    // ==== اصلاح اصلی: همیشه به Space شما وصل بشه ====
     get url() {
+        return 'wss://really-amin-datasourceforcryptocurrency.hf.space/ws';
     }
+    // اگر بعداً بخوای از HTML کنترل کنی:
+    // return window.WS_URL || 'wss://really-amin-datasourceforcryptocurrency.hf.space/ws';
     logEvent(event) {
         const entry = { ...event, time: new Date().toISOString() };
     }
     subscribe(type, callback) {
+        if (!this.typeSubscribers.has(type)) this.typeSubscribers.set(type, new Set());
         const set = this.typeSubscribers.get(type);
         set.add(callback);
         return () => set.delete(callback);
     }
     updateStatus(newStatus) {
+        if (this.status !== newStatus) {
+            this.status = newStatus;
+            this.statusSubscribers.forEach(cb => cb(newStatus));
+        }
     }
     connect() {
+        if (this.socket && (this.socket.readyState === WebSocket.CONNECTING || this.socket.readyState === WebSocket.OPEN)) {
             return;
         }
         this.socket = new WebSocket(this.url);
         this.logEvent({ type: 'status', status: 'connecting' });
+        this.socket.onopen = () => {
             this.backoff = 1000;
             this.updateStatus('connected');
             this.logEvent({ type: 'status', status: 'connected' });
+            console.log('[WS] Connected to Really-amin Space');
+        };
+        this.socket.onmessage = (event) => {
             try {
                 const data = JSON.parse(event.data);
                 this.logEvent({ type: 'message', messageType: data.type || 'unknown' });
+                this.globalSubscribers.forEach(cb => cb(data));
                 if (data.type && this.typeSubscribers.has(data.type)) {
+                    this.typeSubscribers.get(data.type).forEach(cb => cb(data));
                 }
+            } catch (e) {
+                console.error('WS parse error:', e);
             }
+        };
+        this.socket.onclose = () => {
             this.updateStatus('disconnected');
             this.logEvent({ type: 'status', status: 'disconnected' });
             if (this.shouldReconnect) {
                 this.backoff = Math.min(this.backoff * 2, this.maxBackoff);
                 setTimeout(() => this.connect(), delay);
             }
+        };
+        this.socket.onerror = (error) => {
+            console.error('WebSocket error:', error);
+            this.logEvent({ type: 'error', details: 'connection failed' });
+        };
     }
     disconnect() {
         this.shouldReconnect = false;
+        if (this.socket) this.socket.close();
     }
     getEvents() {
 }
 const wsClient = new WSClient();
+wsClient.connect(); // خودکار وصل بشه
+export default wsClient;