Update app.py

app.py

@@ -13,9 +13,8 @@ import logging
 import threading
 from huggingface_hub import HfApi, hf_hub_download
 from huggingface_hub.utils import RepositoryNotFoundError
-import requests
 
-BOT_TOKEN = os.getenv("BOT_TOKEN", "7566834146:AAGiG4MaTZZvvbTVsqEJVG5SYK5hUlc_Ewo")
+BOT_TOKEN = os.getenv("BOT_TOKEN", "7566834146:AAGiG4MaTZZvvtTVsqEJVG5SYK5hUlc_Ewo")
 HOST = '0.0.0.0'
 PORT = 7860
 DATA_FILE = 'data.json'
@@ -35,10 +34,9 @@ visitor_data_cache = {}
 def download_data_from_hf():
     global visitor_data_cache
     if not HF_TOKEN_READ:
-        logging.warning("HF_TOKEN_READ not set. Skipping Hugging Face download.")
+        logging.warning("HF_TOKEN_READ not set.")
         return False
     try:
-        logging.info(f"Attempting to download {HF_DATA_FILE_PATH} from {REPO_ID}...")
         hf_hub_download(
             repo_id=REPO_ID,
             filename=HF_DATA_FILE_PATH,
@@ -49,18 +47,15 @@ def download_data_from_hf():
             force_download=True,
             etag_timeout=10
         )
-        logging.info("Data file successfully downloaded from Hugging Face.")
         with _data_lock:
             try:
                 with open(DATA_FILE, 'r', encoding='utf-8') as f:
                     visitor_data_cache = json.load(f)
-                logging.info("Successfully loaded downloaded data into cache.")
             except (FileNotFoundError, json.JSONDecodeError) as e:
-                 logging.error(f"Error reading downloaded data file: {e}. Starting with empty cache.")
                  visitor_data_cache = {}
         return True
     except RepositoryNotFoundError:
-        logging.error(f"Hugging Face repository '{REPO_ID}' not found. Cannot download data.")
+        logging.error(f"Hugging Face repository '{REPO_ID}' not found.")
     except Exception as e:
         logging.error(f"Error downloading data from Hugging Face: {e}")
     return False
@@ -72,15 +67,11 @@ def load_visitor_data():
             try:
                 with open(DATA_FILE, 'r', encoding='utf-8') as f:
                     visitor_data_cache = json.load(f)
-                logging.info("Visitor data loaded from local JSON.")
             except FileNotFoundError:
-                logging.warning(f"{DATA_FILE} not found locally. Starting with empty data.")
                 visitor_data_cache = {}
             except json.JSONDecodeError:
-                logging.error(f"Error decoding {DATA_FILE}. Starting with empty data.")
                 visitor_data_cache = {}
             except Exception as e:
-                logging.error(f"Unexpected error loading visitor data: {e}")
                 visitor_data_cache = {}
         return visitor_data_cache
 
@@ -90,17 +81,14 @@ def save_visitor_data(data):
             visitor_data_cache.update(data)
             with open(DATA_FILE, 'w', encoding='utf-8') as f:
                 json.dump(visitor_data_cache, f, ensure_ascii=False, indent=4)
-            logging.info(f"Visitor data successfully saved to {DATA_FILE}.")
             upload_data_to_hf_async()
         except Exception as e:
             logging.error(f"Error saving visitor data: {e}")
 
 def upload_data_to_hf():
     if not HF_TOKEN_WRITE:
-        logging.warning("HF_TOKEN_WRITE not set. Skipping Hugging Face upload.")
         return
     if not os.path.exists(DATA_FILE):
-        logging.warning(f"{DATA_FILE} does not exist. Skipping upload.")
         return
 
     try:
@@ -108,10 +96,8 @@ def upload_data_to_hf():
         with _data_lock:
              file_content_exists = os.path.getsize(DATA_FILE) > 0
              if not file_content_exists:
-                 logging.warning(f"{DATA_FILE} is empty. Skipping upload.")
                  return
 
-             logging.info(f"Attempting to upload {DATA_FILE} to {REPO_ID}/{HF_DATA_FILE_PATH}...")
              api.upload_file(
                  path_or_fileobj=DATA_FILE,
                  path_in_repo=HF_DATA_FILE_PATH,
@@ -120,7 +106,6 @@ def upload_data_to_hf():
                  token=HF_TOKEN_WRITE,
                  commit_message=f"Update visitor data {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
              )
-        logging.info("Visitor data successfully uploaded to Hugging Face.")
     except Exception as e:
         logging.error(f"Error uploading data to Hugging Face: {e}")
 
@@ -130,11 +115,9 @@ def upload_data_to_hf_async():
 
 def periodic_backup():
      if not HF_TOKEN_WRITE:
-         logging.info("Periodic backup disabled: HF_TOKEN_WRITE not set.")
          return
      while True:
          time.sleep(3600)
-         logging.info("Initiating periodic backup...")
          upload_data_to_hf()
 
 def verify_telegram_data(init_data_str):
@@ -157,7 +140,7 @@ def verify_telegram_data(init_data_str):
             auth_date = int(parsed_data.get('auth_date', [0])[0])
             current_time = int(time.time())
             if current_time - auth_date > 86400:
-                 logging.warning(f"Telegram InitData is older than 1 hour (Auth Date: {auth_date}, Current: {current_time}).")
+                 pass
             return parsed_data, True
         else:
             logging.warning(f"Data verification failed. Calculated: {calculated_hash}, Received: {received_hash}")
@@ -174,7 +157,6 @@ TEMPLATE = """
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no, user-scalable=no, viewport-fit=cover">
     <title>Morshen Group</title>
     <script src="https://telegram.org/js/telegram-web-app.js"></script>
-    <script src="https://unpkg.com/@tonconnect/ui@latest/dist/tonconnect-ui.min.js"></script>
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap" rel="stylesheet">
@@ -275,6 +257,14 @@ TEMPLATE = """
             background: rgba(44, 44, 46, 0.95);
             box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.2), var(--shadow-medium);
         }
+         .btn-red {
+             background: linear-gradient(95deg, #ff3b30, #ff453a);
+             color: var(--tg-theme-button-text-color);
+         }
+         .btn-red:hover {
+             background: linear-gradient(95deg, #ff453a, #ff3b30);
+         }
+
         .tag {
             display: inline-block; background: var(--tag-bg); color: var(--text-secondary-color);
             padding: 6px 12px; border-radius: var(--border-radius-s); font-size: 0.85em;
@@ -366,6 +356,7 @@ TEMPLATE = """
             box-shadow: var(--shadow-medium), 0 0 0 4px rgba(var(--tg-theme-bg-color-rgb, 18, 18, 18), 0.3);
         }
         .save-card-button i { font-size: 1.2em; }
+
         .modal {
             display: none; position: fixed; z-index: 1001;
             left: 0; top: 0; width: 100%; height: 100%;
@@ -396,6 +387,7 @@ TEMPLATE = """
         .modal-text { font-size: 1.2em; line-height: 1.6; margin-bottom: var(--padding-s); word-wrap: break-word; }
         .modal-text b { color: var(--tg-theme-link-color); font-weight: 600; }
         .modal-instruction { font-size: 1em; color: var(--text-secondary-color); margin-top: var(--padding-m); }
+
         .icon { display: inline-block; width: 1.2em; text-align: center; margin-right: 8px; opacity: 0.9; }
         .icon-save::before { content: '💾'; }
         .icon-web::before { content: '🌐'; }
@@ -416,21 +408,9 @@ TEMPLATE = """
         .icon-link::before { content: '🔗'; }
         .icon-leader::before { content: '🏆'; }
         .icon-company::before { content: '🏢'; }
-        .icon-wallet::before { content: '💎'; }
-        .wallet-info-item {
-            font-size: 1em; color: var(--text-secondary-color); word-break: break-all;
-            margin-top: var(--padding-s);
-        }
-        .wallet-info-item strong {
-            color: var(--text-color);
-        }
-        .wallet-balance {
-            font-size: 1.8em; font-weight: 700; color: var(--tg-theme-link-color);
-            margin-top: var(--padding-s);
-        }
-        #ton-connect-button > button {
-             width: 100%;
-        }
+        .icon-ton::before { content: '💎'; }
+        .icon-wallet::before { content: '👛'; }
+
         @media (max-width: 480px) {
             .section-title { font-size: 1.8em; }
             .logo span { font-size: 1.4em; }
@@ -466,21 +446,22 @@ TEMPLATE = """
              </a>
         </section>
 
-        <section class="section-card">
-            <h2 class="section-title"><i class="icon icon-wallet"></i>TON Кошелек</h2>
-            <p class="description">
-                Подключите ваш TON кошелек, чтобы проверить баланс прямо в приложении.
-            </p>
-            <div id="wallet-info" style="display: none; margin-top: var(--padding-m);">
-                <div class="wallet-info-item">
-                    <strong>Баланс:</strong>
-                    <div class="wallet-balance"><span id="wallet-balance">...</span> TON</div>
-                </div>
-                <div class="wallet-info-item">
-                    <strong>Адрес:</strong> <span id="wallet-address"></span>
-                </div>
-            </div>
-            <div id="ton-connect-button" style="margin-top: var(--padding-m);"></div>
+        <section class="ton-wallet-section section-card">
+             <h2 class="section-title"><i class="icon icon-ton"></i>TON Кошелек</h2>
+             <p class="description" id="ton-wallet-status">Статус: Не подключен</p>
+             <div id="ton-info" style="display: none;">
+                 <p class="modal-text" style="font-size: 1.1em; margin-bottom: var(--padding-s);">
+                     <b>Адрес:</b> <span id="ton-wallet-address" style="word-break: break-all;"></span>
+                 </p>
+                 <p class="modal-text" style="font-size: 1.1em;">
+                     <b>Баланс:</b> <span id="ton-balance"></span> TON
+                 </p>
+             </div>
+             <div style="display: flex; gap: var(--padding-s); margin-top: var(--padding-m);">
+                 <button id="connect-ton-btn" class="btn" style="flex-grow: 1;"><i class="icon icon-wallet"></i>Подключить кошелек</button>
+                 <button id="disconnect-ton-btn" class="btn btn-red" style="flex-grow: 1; display: none;">Отключить</button>
+             </div>
+             <p id="ton-error" style="color: var(--admin-danger); font-size: 0.9em; margin-top: var(--padding-s); display: none;"></p>
         </section>
 
          <section class="ecosystem-header">
@@ -588,8 +569,10 @@ TEMPLATE = """
     </div>
 
 
+    <script src="https://unpkg.com/@tonconnect/sdk@2.0.0/dist/tonconnect-sdk.min.js"></script>
     <script>
         const tg = window.Telegram.WebApp;
+        let tonConnectSDK = null;
 
         function applyTheme(themeParams) {
             const root = document.documentElement;
@@ -612,60 +595,36 @@ TEMPLATE = """
             }
         }
 
-        async function fetchBalance(address) {
-            const balanceEl = document.getElementById('wallet-balance');
-            balanceEl.textContent = '...';
-            try {
-                const response = await fetch('/ton_balance', {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/json',
-                        'Accept': 'application/json'
-                    },
-                    body: JSON.stringify({ address: address }),
-                });
-
-                if (!response.ok) {
-                    throw new Error(`HTTP error! status: ${response.status}`);
-                }
-
-                const data = await response.json();
-                if (data.status === 'ok') {
-                    balanceEl.textContent = data.balance;
-                } else {
-                    throw new Error(data.message || 'Failed to fetch balance');
-                }
-            } catch (error) {
-                console.error('Error fetching balance:', error);
-                balanceEl.textContent = 'Ошибка';
-                if (tg.HapticFeedback) tg.HapticFeedback.notificationOccurred('error');
-            }
-        }
-
-        function setupTonConnect() {
-            const tonConnectUI = new TonConnectUI.TonConnectUI({
-                manifestUrl: window.location.origin + '/tonconnect-manifest.json',
-                uiOptions: {
-                    buttonRootId: 'ton-connect-button'
-                }
-            });
-
-            const walletInfoEl = document.getElementById('wallet-info');
-            const walletAddressEl = document.getElementById('wallet-address');
-
-            tonConnectUI.onStatusChange(wallet => {
-                if (wallet) {
-                    const address = TonConnectUI.toUserFriendlyAddress(wallet.account.address);
-                    walletAddressEl.textContent = `${address.slice(0, 6)}...${address.slice(-4)}`;
-                    walletInfoEl.style.display = 'block';
-                    fetchBalance(wallet.account.address);
-                } else {
-                    walletInfoEl.style.display = 'none';
-                    document.getElementById('wallet-balance').textContent = '...';
-                    walletAddressEl.textContent = '';
-                }
-            });
-        }
+        async function fetchTonBalance(address) {
+             const rpcUrl = 'https://rpc.toncenter.com/api/v2/jsonRPC'; // Public RPC endpoint
+             try {
+                 const response = await fetch(rpcUrl, {
+                     method: 'POST',
+                     headers: {
+                         'Content-Type': 'application/json',
+                     },
+                     body: JSON.stringify({
+                         jsonrpc: '2.0',
+                         id: 1,
+                         method: 'getBalance',
+                         params: {
+                             address: address
+                         }
+                     })
+                 });
+                 if (!response.ok) throw new Error(`RPC error: ${response.status}`);
+                 const data = await response.json();
+                 if (data.error) throw new Error(`RPC error: ${data.error.message}`);
+                 const balanceNanoTon = parseInt(data.result);
+                 const balanceTon = balanceNanoTon / 1e9;
+                 return balanceTon.toFixed(4);
+             } catch (error) {
+                 console.error('Error fetching TON balance:', error);
+                 document.getElementById('ton-error').textContent = `Ошибка получения баланса: ${error.message}`;
+                 document.getElementById('ton-error').style.display = 'block';
+                 return 'N/A';
+             }
+         }
 
 
         function setupTelegram() {
@@ -713,7 +672,6 @@ TEMPLATE = """
                  greetingElement.textContent = `Добро пожаловать, ${name}! 👋`;
              } else {
                  greetingElement.textContent = 'Добро пожаловать!';
-                 console.warn('Telegram User data not available (initDataUnsafe.user is empty).');
              }
 
              const contactButtons = document.querySelectorAll('.contact-link');
@@ -746,23 +704,85 @@ TEMPLATE = """
                          modal.style.display = "none";
                      }
                  });
-             } else {
-                 console.error("Modal elements not found!");
              }
-             
-             setupTonConnect();
 
              document.body.style.visibility = 'visible';
+
+             // --- TON Connect Integration ---
+             const connectTonBtn = document.getElementById('connect-ton-btn');
+             const disconnectTonBtn = document.getElementById('disconnect-ton-btn');
+             const tonWalletStatus = document.getElementById('ton-wallet-status');
+             const tonWalletAddress = document.getElementById('ton-wallet-address');
+             const tonBalance = document.getElementById('ton-balance');
+             const tonInfoDiv = document.getElementById('ton-info');
+             const tonErrorDiv = document.getElementById('ton-error');
+
+             if (connectTonBtn && disconnectTonBtn && tonWalletStatus && tonWalletAddress && tonBalance && tonInfoDiv && tonErrorDiv) {
+                 try {
+                     tonConnectSDK = new TonConnectSDK.TonConnectSDK({
+                         manifestUrl: window.location.origin + '/tonconnect-manifest.json',
+                         actionsConfiguration: {
+                              twaReturnUrl: 'https://t.me/YOUR_BOT_USERNAME/YOUR_MINIAPP_SHORTNAME' // Replace with your bot/app details
+                         }
+                     });
+
+                     tonConnectSDK.onStatusChange(async wallet => {
+                         tonErrorDiv.style.display = 'none';
+                         if (wallet) {
+                             tonWalletStatus.textContent = 'Статус: Подключен ✅';
+                             tonWalletAddress.textContent = wallet.account.address;
+                             tonInfoDiv.style.display = 'block';
+                             connectTonBtn.style.display = 'none';
+                             disconnectTonBtn.style.display = 'inline-flex';
+                             tonBalance.textContent = 'Загрузка...';
+                             const balance = await fetchTonBalance(wallet.account.address);
+                             tonBalance.textContent = balance;
+                             if (tg.HapticFeedback) {
+                                tg.HapticFeedback.notificationOccurred('success');
+                             }
+                         } else {
+                             tonWalletStatus.textContent = 'Статус: Не подключен';
+                             tonWalletAddress.textContent = '';
+                             tonBalance.textContent = '';
+                             tonInfoDiv.style.display = 'none';
+                             connectTonBtn.style.display = 'inline-flex';
+                             disconnectTonBtn.style.display = 'none';
+                             if (tg.HapticFeedback) {
+                                 tg.HapticFeedback.notificationOccurred('warning');
+                             }
+                         }
+                         tg.MainButton.hide(); // Hide main button if shown by SDK
+                     });
+
+                     connectTonBtn.addEventListener('click', () => {
+                         tonConnectSDK.connectWallet();
+                     });
+
+                     disconnectTonBtn.addEventListener('click', () => {
+                         tonConnectSDK.disconnect();
+                     });
+
+                     tonConnectSDK.restoreConnection(); // Attempt to restore previous connection
+
+                 } catch (e) {
+                      console.error("Error initializing TON Connect SDK:", e);
+                      tonErrorDiv.textContent = `Ошибка инициализации TON Connect: ${e.message}`;
+                      tonErrorDiv.style.display = 'block';
+                      connectTonBtn.disabled = true;
+                 }
+             } else {
+                  console.error("TON Wallet section elements not found!");
+             }
+             // --- End TON Connect Integration ---
+
          }
 
         if (window.Telegram && window.Telegram.WebApp) {
             setupTelegram();
         } else {
-            console.warn("Telegram WebApp script not immediately available, waiting for window.onload");
             window.addEventListener('load', setupTelegram);
              setTimeout(() => {
                  if (document.body.style.visibility !== 'visible') {
-                      console.error("Telegram WebApp script fallback timeout triggered.");
                       const greetingElement = document.getElementById('greeting');
                       if(greetingElement) greetingElement.textContent = 'Ошибка загрузки интерфейса Telegram.';
                       document.body.style.visibility = 'visible';
@@ -865,6 +885,7 @@ ADMIN_TEMPLATE = """
              transition: background-color 0.2s ease;
         }
          .refresh-btn:hover { background-color: #0b5ed7; }
+
         .admin-controls {
             background: var(--admin-card-bg);
             padding: var(--padding);
@@ -963,7 +984,6 @@ ADMIN_TEMPLATE = """
             } catch (error) {
                 statusMessage.textContent = `Ошибка ${action}: ${error.message}`;
                 statusMessage.style.color = 'var(--admin-danger)';
-                console.error(`Error during ${action}:`, error);
             } finally {
                 loader.style.display = 'none';
             }
@@ -1033,6 +1053,17 @@ def verify_data():
         logging.exception("Error in /verify endpoint")
         return jsonify({"status": "error", "message": "Internal server error"}), 500
 
+@app.route('/tonconnect-manifest.json')
+def tonconnect_manifest():
+    manifest = {
+        "url": request.url_root.rstrip('/') + "/tonconnect-manifest.json",
+        "name": "Morshen Group Mini App",
+        "iconUrl": request.url_root.rstrip('/') + "/static/morshengroup.png", # You need to serve your icon
+        "termsOfUseUrl": "https://example.com/terms", # Replace with your terms URL
+        "privacyPolicyUrl": "https://example.com/privacy" # Replace with your privacy URL
+    }
+    return jsonify(manifest)
+
 @app.route('/admin')
 def admin_panel():
     current_data = load_visitor_data()
@@ -1054,73 +1085,25 @@ def admin_trigger_upload():
     upload_data_to_hf_async()
     return jsonify({"status": "ok", "message": "Загрузка данных на Hugging Face запущена в фоновом режиме."})
 
-@app.route('/tonconnect-manifest.json')
-def tonconnect_manifest():
-    return jsonify({
-        "url": request.host_url.rstrip('/'),
-        "name": "Morshen Group App",
-        "iconUrl": "https://huggingface.co/spaces/Aleksmorshen/Telemap8/resolve/main/morshengroup.jpg"
-    })
-
-@app.route('/ton_balance', methods=['POST'])
-def get_ton_balance():
-    req_data = request.get_json()
-    address = req_data.get('address')
-    if not address:
-        return jsonify({"status": "error", "message": "Address is required"}), 400
-    
-    try:
-        api_url = f"https://toncenter.com/api/v2/getWalletInformation?address={address}"
-        response = requests.get(api_url)
-        response.raise_for_status()
-        data = response.json()
-
-        if data.get("ok"):
-            balance_nanotons = int(data["result"]["balance"])
-            balance_ton = balance_nanotons / 1_000_000_000
-            return jsonify({"status": "ok", "balance": f"{balance_ton:.4f}"})
-        else:
-            return jsonify({"status": "error", "message": "Failed to get balance from API"}), 500
-    except requests.exceptions.RequestException as e:
-        logging.error(f"Error fetching TON balance from Toncenter: {e}")
-        return jsonify({"status": "error", "message": "Could not connect to TON API"}), 503
-    except (KeyError, ValueError) as e:
-        logging.error(f"Error parsing Toncenter response: {e}")
-        return jsonify({"status": "error", "message": "Invalid API response from Toncenter"}), 500
+# Basic route to serve static files (like the icon)
+@app.route('/static/<path:filename>')
+def static_files(filename):
+    # You would put your morshengroup.png in a 'static' folder
+    # e.g., /static/morshengroup.png
+    # For this example, we'll serve a placeholder or you'll need to add the static folder
+    # and place your icon there.
+    # A simple placeholder response:
+     if filename == 'morshengroup.png':
+          return Response(open('morshengroup.jpg', 'rb').read(), mimetype='image/jpeg') # Assuming morshengroup.jpg exists locally
+     return Response("File not found", status=404)
 
-if __name__ == '__main__':
-    print("---")
-    print("--- MORSHEN GROUP MINI APP SERVER ---")
-    print("---")
-    print(f"Flask server starting on http://{HOST}:{PORT}")
-    print(f"Using Bot Token ID: {BOT_TOKEN.split(':')[0]}")
-    print(f"Visitor data file: {DATA_FILE}")
-    print(f"Hugging Face Repo: {REPO_ID}")
-    print(f"HF Data Path: {HF_DATA_FILE_PATH}")
-    if not HF_TOKEN_READ or not HF_TOKEN_WRITE:
-         print("---")
-         print("--- WARNING: HUGGING FACE TOKEN(S) NOT SET ---")
-         print("--- Backup/restore functionality will be limited. Set HF_TOKEN_READ and HF_TOKEN_WRITE environment variables.")
-         print("---")
-    else:
-         print("--- Hugging Face tokens found.")
-         print("--- Attempting initial data download from Hugging Face...")
-         download_data_from_hf()
 
+if __name__ == '__main__':
+    download_data_from_hf()
     load_visitor_data()
 
-    print("---")
-    print("--- SECURITY WARNING ---")
-    print("--- The /admin route and its sub-routes are NOT protected.")
-    print("--- Implement proper authentication before deploying.")
-    print("---")
-
     if HF_TOKEN_WRITE:
         backup_thread = threading.Thread(target=periodic_backup, daemon=True)
         backup_thread.start()
-        print("--- Periodic backup thread started (every hour).")
-    else:
-        print("--- Periodic backup disabled (HF_TOKEN_WRITE missing).")
 
-    print("--- Server Ready ---")
     app.run(host=HOST, port=PORT, debug=False)