Добавил WireGuard и nginx proxy для Flask

API/df.py

@@ -13,10 +13,10 @@ sys.path.insert(0, project_root)
 
 # print(db_price)
 
-# download_products()
+download_products()
 download_prices()
 
 decrypt_and_unpack("prices")
-# decrypt_and_unpack("products")  
-# add_product()
+decrypt_and_unpack("products")  
+add_product()
 update_prices()

API/rok.py

@@ -1,10 +1,8 @@
 from dotenv import load_dotenv
 import os
 load_dotenv()
-import sqlite3
-import requests
 
-conn = sqlite3.connect("./files/rokky.db")
+import requests
 partner = os.getenv('partner')
 user_name = os.getenv('userName')
 password = os.getenv('password')
@@ -30,7 +28,7 @@ def tokens():
     access_token =  data["accessToken"]
     return access_token
     
-# access_token = tokens()
+access_token = tokens()
 
 def get_orders(access_token, page=1, page_size=25):
     url = f"{BASE_URL}/orders"
@@ -80,10 +78,8 @@ def download_prices():
     print("Каталог цен скачан.")
 
 
-def create_order(sku, unit_price, partner_order_id):
+def create_order(sku, quantity, unit_price, partner_order_id):
     # try:
-    conn = sqlite3.connect("./files/rokky.db")
-    cursor = conn.cursor()
     url = f"{BASE_URL}/orders"
 
     headers = {
@@ -95,11 +91,11 @@ def create_order(sku, unit_price, partner_order_id):
         "items": [
             {
                 "sku": int(sku),
-                "quantity": 1,
+                "quantity": int(quantity),
                 "unitPrice": float(unit_price)
             }
         ],
-        "partnerOrderId": f"my-orders{partner_order_id}"
+        "partnerOrderId": partner_order_id
     }
 
     try:
@@ -121,18 +117,7 @@ def create_order(sku, unit_price, partner_order_id):
             
             response.raise_for_status()  # Всё равно выбрасываем исключение
             
-        r = response.json()
-        order_id = r["orderId"]
-        print(partner_order_id)
-        print(order_id)
-        cursor.execute("""
-            UPDATE orders
-            SET orders_rokky = ?
-            WHERE id_i = ?
-        """, (order_id, partner_order_id))
-
-        conn.commit()
-        conn.close()
+        return response.json()
         
     except requests.exceptions.RequestException as e:
         print(f"🌐 Сетевая ошибка: {e}")
@@ -161,9 +146,6 @@ def get_orders(page=1, page_size=25):
 
 
 def get_order_content(order_id):
-    conn = sqlite3.connect("./files/rokky.db")
-    
-    cursor = conn.cursor()
     url = f"{BASE_URL}/orders/{order_id}/content"
 
     headers = {
@@ -174,31 +156,20 @@ def get_order_content(order_id):
     response = requests.get(url, headers=headers)
     response.raise_for_status()
     data = response.json()
-    
     con = data['orderContentItems']
     for c in con:
         content = c['content']
-        
-    cursor.execute("""
-        UPDATE orders
-        SET key = ?
-        WHERE orders_rokky = ?
-    """, (content, order_id))
-
-    conn.commit()
-    conn.close()
-    
     return  content
 
 
-# content = get_order_content(5388720)
+# content = get_order_content(5379499)
 # print(content)
 
 # orders = get_orders()
 # print(orders)
 
 
-# order = create_order(22785, 22.63, "my-test-order-122w3")
+# order = create_order(22774, 1, 21.3, "my-test-order-12w3")
 # print(order)
 
 

API/rokky.py

@@ -173,7 +173,7 @@ def update_prices():
     data = []
     for item in prices:
         sku = item["sku"]
-        price = item.get("price")
+        price = item.get("basePrice")
         price_gg = item.get("baseSuggestedRetailPrice")
         price_sales =item.get("discountPercentage")
         is_sale = item.get("isSale")
@@ -201,4 +201,4 @@ def update_prices():
 # decrypt_and_unpack("prices")
 # decrypt_and_unpack("products")  
 # add_product()
-# update_prices()
+update_prices()

API/ww

@@ -1 +1 @@
-id_i=34534345435&id_d=102180432&amount=33&curr=USD&date=2026-03-20T10:43:09+03:00&email=rusinowdima2@yandex.ru&sha256=5110eb4a7aa7c60d66f9648db40027f241c52673a6a7c9a136e27a02fd1711fb&ip={IP}&isMyProduct=true
+5110eb4a7aa7c60d66f9648db40027f241c52673a6a7c9a136e2a02fd1711fb&amount=1.0&currency=RUB&date=2026-03-20T10=43=09+03=00&email=rusinowdima2@yandex.ru&id_d=102180432&id_i=21327450&ip=188.32.208.151&is_my_product=true

Dockerfile

@@ -1,7 +1,7 @@
 FROM python:3.12-slim-bookworm
 
 # The installer requires curl (and certificates) to download the release archive
-RUN apt-get update && apt-get install -y --no-install-recommends curl ca-certificates nano
+RUN apt-get update && apt-get install -y --no-install-recommends curl ca-certificates nano wireguard iproute2 iputils-ping curl
 
 # Download the latest installer
 ADD https://astral.sh/uv/install.sh /uv-installer.sh
@@ -26,4 +26,4 @@ EXPOSE 5205
 
 
 # Presuming there is a `my_app` command provided by the project uvicorn main:app --reload
-CMD ["uv", "run", "main.py"]
+CMD ["bash", "-c", "wg-quick up /app/wireguard/wg0.conf && uv run main.py"]

app/routes.py

@@ -4,12 +4,9 @@ import os
 import sqlite3
 import json
 # from services.rokky import ones
-from API.rok import create_order, get_order_content
+from API.rok import create_order
 from API.TG import send_telegram
 from services.orders import get_sku
-from services.gg import get_product, create_messagea
-from services.send_mai import send_html_flow
-
 import logging
 
 
@@ -29,30 +26,21 @@ def get_image(filename):
 
 @main.route("/orders/api_payments", methods=["POST", "GET"])
 def index1():
-    DB_PATH = "./files/rokky.db"
     # Получаем все GET-параметры
     params = request.args.to_dict()
     logging.warn(f"newOrder: {params}")
     # Просто выводим на экран (в ответ клиенту)
     # парсим данные
-    id_d = params.get("id_d")
-    id_i = params.get("id_i")
+    sku = params.get("id_d")
+    product_id = params.get("id_i")
     email = params.get("email")
-    amount = params.get("amount")
-    currency = params.get("currency")
-    date = params.get("date")
+    price = params.get("amount")
+
     # всё остальное сохраняем как JSON
     content = json.dumps(params, ensure_ascii=False)
-    send_telegram(content)
-    
-    message  =  f"🔹Спасибо за покупку в WST Keys (West Store Trusted Keys)\n\n ⏳ Ваш заказ обрабатывается и будет доставлен автоматически"
-    create_messagea(id_i, message)
-    # 
-    sku_rokky, price_rokky = get_sku(id_d)
-    
-    
-    send_telegram(content)
-    name_p, im = get_product(id_d)
+    db_sku, db_price = get_sku(sku)
+    create_order(db_sku, price, db_price, f"my-test-order-{product_id}")
+    # send_telegram(content)
     conn = sqlite3.connect(DB_PATH)
     cursor = conn.cursor()
     
@@ -60,9 +48,9 @@ def index1():
 
     try:
         cursor.execute("""
-            INSERT INTO orders (id_i, id_d, email,name_p, im,  amount, content, currency, date, sku_rokky, price_rokky)
-            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?)
-        """, (id_i, id_d, email, name_p, im, amount, content, currency, date, sku_rokky, price_rokky))
+            INSERT INTO orders (sku, product_id, email, price, content)
+            VALUES (?, ?, ?, ?, ?)
+        """, (sku, product_id, email, price, content))
 
         conn.commit()
     except Exception as e:
@@ -70,16 +58,18 @@ def index1():
         return jsonify({"error": str(e)}), 500
 
     conn.close()
-    send_telegram(create_order(sku_rokky, price_rokky, id_i))
 
     return jsonify({"success": True}), 200
 
     # return "Hello GET"
 
+@main.route("/sales", methods=["POST", "GET"])
+def index2():
+    return "Hello GET!!!++!!ss"
+
 
 @main.route("/newOrder", methods=["POST"])
 def new_order():
-    
     if not request.is_json:
         return jsonify({"error": "Invalid content type"}), 400
 
@@ -94,13 +84,9 @@ def new_order():
 
     # TODO: обработка заказа
     print(f"New order received: {order_id}")
-    send_telegram(order_id)
-    
+    send_telegram(data)
+    # logging.warn(get_order_content(order_id))
     logging.warn(f"newOrder: {order_id}")
-    get_order_content(order_id)
-    send_html_flow(order_id)
-    
-    
 
     return jsonify({"status": "ok"}), 200
 

docker-compose.yml

@@ -12,33 +12,19 @@ services:
       - ./nginx/certbot/conf:/etc/letsencrypt
     extra_hosts:
       - "host.docker.internal:host-gateway"
-    depends_on:
-      - web
-    restart: always
-
-  wg-client:
-    image: ghcr.io/linuxserver/wireguard
-    container_name: wg-client
-    cap_add:
-      - NET_ADMIN
-      - SYS_MODULE
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Amsterdam
-    volumes:
-      - ./wg:/config  # сюда кладём ./wg/wg_confs/wg0.conf
     restart: always
 
   web:
     build: .
     container_name: flask-dev
+    ports:
+      - "5205:5205" # Пробрасываем порт наружу
     volumes:
+      # Главная строка: монтируем текущую папку с кодом (.)
+      # в папку /app внутри контейнера
       - .:/app
     environment:
-      - FLASK_DEBUG=1
-      - PYTHONUNBUFFERED=1
-    network_mode: "service:wg-client"  # весь трафик Flask через VPN
-    depends_on:
-      - wg-client
-    restart: always
+      - FLASK_DEBUG=1 # Дополнительная страховка для включения дебага
+      - PYTHONUNBUFFERED=1 # Чтобы логи выводились сразу, а не кэшировались
+
+  

models/orders.py

@@ -6,19 +6,10 @@ cursor = conn.cursor()
 cursor.execute("""
 CREATE TABLE IF NOT EXISTS orders (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
-    id_i INTEGER UNIQUE,
-    id_d INTEGER,
-    name_p TEXT,
-    im TEXT,
+    sku INTEGER UNIQUE,
+    product_id INTEGER,
     email TEXT,
-    chat_id TEXT,
-    currency TEXT,
-    amount TEXT,
-    date TEXT,
-    sku_rokky TEXT,
-    price_rokky TEXT,
-    orders_rokky TEXT,
-    key TEXT,
+    price TEXT, 
     content TEXT
 )
 """)

services/gg.py

@@ -212,9 +212,9 @@ def get_chats(page=1, pagesize=20, filter_new=None, email=None, id_ds=None):
     return r.json()
 
 
-def get_product(product_id):
+def get_product():
     token = load_token()
-    # product_id = 102180432
+    product_id = 102182541
 
     url = f"https://seller.ggsel.com/api_sellers/api/products/{product_id}/data"
 
@@ -229,14 +229,10 @@ def get_product(product_id):
     r = requests.get(url, headers=headers, params=params)
 
     print(r.status_code)
-    prud = r.json()
-    name = prud["product"]["name"]
-    im = prud["product"]["preview_imgs"][0]["url"]
-    return name, im
-    # return r.json()
+    return r.json()
 
 
-# print(get_product(102184895))
+# print(get_product())
 
 
 def create_message(id_i: int):
@@ -272,91 +268,10 @@ def create_message(id_i: int):
     }
 
 # пример вызова
-# create_message(18094706)
+create_message(18094706)
 
-
-def create_messagea(id_i: int, message):
-    print("SEND MESSAGE CALLED", id_i)
-
-    token = load_token()
-    # message = "Спасибо за покупку в WST Keys"
-
-    url = "https://seller.ggsel.com/api_sellers/api/debates/v2"
-
-    params = {
-        "token": token,
-        "id_i": id_i
-    }
-
-    payload = {
-        "message": message
-    }
-
-    r = requests.post(url, params=params, json=payload)
-
-    print("STATUS:", r.status_code)
-
-    return r.text
-# message  =  f"🔹Спасибо за покупку в WST Keys (West Store Trusted Keys)\n\n"
-# create_messagea(22289522, message)
 # пример
-
-def get_chats_by_email(email):
-    token = load_token()
-    message = (
-    f""
-    
-)
-
-    url = "https://seller.ggsel.com/api_sellers/api/debates/v2/chats"
-
-    params = {
-        "token": token,
-        'email': email,
-        'pagesize': 100, 
-        'page': 1
-    }
-
-    payload = {
-        "message": message
-    }
-
-    r = requests.get(url, params=params)
-    print(r.text)
-    if r.status_code == 200:
-        return {"success": True}
-    
-    return {
-        "success": False,
-        "status": r.status_code,
-        "response": r.text
-    }
-
-# get_chats_by_email('fenomenplayerok@gmail.com')
-
-
-def get_order_info(invoice_id: int, locale: str = "ru"):
-    token = load_token()
-    url = f"https://seller.ggsel.com/api_sellers/api/purchase/info/{invoice_id}"
-
-    headers = {
-        "Accept": "application/json",
-        "locale": locale
-    }
-
-    params = {
-        "token": token
-    }
-
-    r = requests.get(url, headers=headers, params=params)
-    return r.json()  # или r.text если нужен сырой ответ
-
-# # пример использования
-
-# invoice_id = 22228752
-# info = get_order_info(invoice_id)
-# print(info)
-# print(get_chats(email='fenomenplayerok@gmail.com'))
+# print(get_chats())
 # def tokens():
 
 #     timestamp = str(int(time.time()))
@@ -399,23 +314,3 @@ def get_order_info(invoice_id: int, locale: str = "ru"):
 
 #     print(response.status_code)
 #     print(response.json())
-
-
-# def create_debate(order_id):
-#     token = load_token()
-#     url = "https://seller.ggsel.com/api_sellers/api/debates/v2"
-
-#     params = {
-#         "token": token,
-#         "id_i": order_id
-#     }
-
-#     json = {
-#         "message": "Спасибо за покупку в WST Keys"
-#     }
-
-#     r = requests.post(url, params=params, json=json)
-#     return r.json()
-
-
-# print(create_debate("22257737"))

services/mailer.py

@@ -3,7 +3,7 @@ import smtplib
 from email.message import EmailMessage
 from dotenv import load_dotenv
 
-from services.utils import build_items_html, build_keys_html, render_template
+from utils import build_items_html, build_keys_html, render_template
 
 load_dotenv()
 

services/send_mai.py

@@ -1,8 +1,5 @@
 import sys
-from services.mailer import send_plain_email, send_html_email
-import sqlite3
-from datetime import datetime
-from services.gg import create_messagea
+from mailer import send_plain_email, send_html_email
 
 
 def read_multiline(prompt: str) -> str:
@@ -27,59 +24,43 @@ def send_text_flow():
     send_plain_email(to_addr, subject, body)
 
 
-def send_html_flow(ids):
-    # to_addr = input("Receiver email: ").strip()
+def send_html_flow():
+    to_addr = input("Receiver email: ").strip()
 
-    conn = sqlite3.connect("./files/rokky.db")
-    cursor = conn.cursor()
-
-    sku = ids
-
-    cursor.execute("""
-        SELECT *
-        FROM orders
-        WHERE orders_rokky = ?
-    """, (sku,))
-
-    rows = cursor.fetchall()
-    for row in rows:
-        print(row)
-
-
-    
-    s = row[9]
-    s = s.replace(" ", "+", 1)  # только первое вхождение после времени
-    dt = datetime.fromisoformat(s)
-    dates = dt.strftime("%Y-%m-%d %H:%M:%S")
     data = {
-    #     "company_name": "wstkeys",
-        "order_id": row[1],
-    #     "customer_name": "4321",
-        "currency": row[7],
+        "company_name": "wstkeys",
+        "order_id": "123",
+        "customer_name": "4321",
+        "currency": "USD",
         "items": [
-            {"name": row[3], "quantity": 1, "price": row[8]},
+            {"name": "Game 1333", "quantity": 1, "price": 1330},
             
         ],
-        "date": dates,
-        "product_name": row[3],
-        "product_image": row[4],
-        "total_price": row[8],
-        "key": row[13],
+        "date": "23.03.2026 14:02",
+        "product_name": "Railroads Online - Pioneer DLC",
+        "product_image": "https://s3.ggsel.com/gsellers-imgs-prod/e05c8d1f28e18f56334bf8e7e9f7b547.jpeg",
+        "total_price": 20,
+        "key": 'XXXX-XXXX-YYY23',
         "support_email": "wstkeys@gmail.com",
         "year": 2026
     }
-    to_addr = row[5]
+
     send_html_email(to_addr, data)
-    message = (
-        
-        f"🔑 Ваш ключ: {row[13]}\n\n"
-        "📩 Копия ключа отправлена на вашу электронную почту.\n"
-        "💬 Если у вас возникнут вопросы — напишите нам.\n"
-        "⭐️ Нам очень важно ваше мнение, пожалуйста, оставьте отзыв."
-    )
-    create_messagea(row[1], message )    
-    
-    conn.close()
 
 
-# send_html_flow(5388351)
+def main():
+    print("1 - Send plain email")
+    print("2 - Send HTML email")
+
+    choice = input("Choose: ").strip()
+
+    if choice == "1":
+        send_text_flow()
+    elif choice == "2":
+        send_html_flow()
+    else:
+        print("Invalid choice")
+
+
+if __name__ == "__main__":
+    main()

services/test.py

@@ -1,25 +0,0 @@
-import sqlite3
-from datetime import datetime
-conn = sqlite3.connect("./files/rokky.db")
-cursor = conn.cursor()
-
-sku = '5388258'
-
-cursor.execute("""
-    SELECT *
-    FROM orders
-    WHERE orders_rokky = ?
-""", (sku,))
-
-rows = cursor.fetchall()
-
-for row in rows:
-    print(row[3])
-    
-s = row[8]
-s = s.replace(" ", "+", 1)  # только первое вхождение после времени
-dt = datetime.fromisoformat(s)
-result = dt.strftime("%Y-%m-%d %H:%M:%S")
-    
-print(result)
-conn.close()

templates/welcome.html

@@ -1,20 +1,18 @@
 <!DOCTYPE html>
 <html>
-<body style="font-family: Arial, sans-serif; background:#080808; padding:20px; color:#fff;">
+<body style="font-family: Arial, sans-serif; background:#0f0f0f; padding:20px; color:#fff;">
 
-<table width="600" align="center" style="background:#000000; padding:20px; border:1px solid #00cfff;">
+<table width="600" align="center" style="background:#111; padding:20px; border:1px solid #00cfff;">
 <tr>
 <td align="center">
 
 <!-- LOGO -->
  <div style="text-align:center; margin-bottom:10px;">
     <img src="https://wstkeys.top/images/10.png" alt="logo" 
-         style="max-width:400px; height:auto;">
+         style="max-width:200px; height:auto;">
 </div>
 <!--<h1 style="color:#00cfff; margin-bottom:5px;">{{company_name}}</h1>-->
-<p style="margin:0; color:#ffffff; font-size:16px; font-weight:bold;">
-  Спасибо за покупку в WST Keys (West Store Trusted Keys)
-</p>
+<p style="margin:0; color:#aaa; font-size:16px;">Спасибо за покупку в WST Keys (West Store Trusted Keys)</p>
 
 <hr style="border:1px solid #00cfff; margin:20px 0;">
 

wireguard/wg0.conf

@@ -13,4 +13,3 @@ PublicKey = bcJDrYlhWls25zz9+bJcWiONw8Qfx1tai504+vKLcgQ=
 PresharedKey = 40DSkC0TTySjBFyUj19++ngCdYxAHZaLnsrz8Ck9R2Q=
 Endpoint = 85.208.110.167:50395
 AllowedIPs = 0.0.0.0/0,::/0
-