10 Commits

Author SHA1 Message Date
df1a60034c try cookies 2025-12-07 18:57:34 +01:00
7094801549 minimum 2025-12-07 18:48:19 +01:00
389d10615e try debug 2025-12-07 18:17:10 +01:00
62b16f1dbf try2 2025-12-07 18:13:15 +01:00
09662e656e try1 2025-12-07 17:59:36 +01:00
b26a6a2d0a Better versionning 2025-12-05 16:46:44 +01:00
cef6886fd2 fixed cache issues 2025-12-05 16:20:42 +01:00
b3fe0fcf24 Merge pull request 'Fixed headers' (#23) from headers-fix into main
Reviewed-on: #23
2025-12-04 22:23:15 +01:00
2484568e5f Fixed headers 2025-12-04 21:20:50 +00:00
7f24145dc2 Minor changes 2025-10-03 13:31:00 +02:00
6 changed files with 79 additions and 20 deletions

2
.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
.venv
__pycache__/

View File

@@ -4,6 +4,7 @@ RUN apk add --no-cache ca-certificates
WORKDIR /app WORKDIR /app
COPY VERSION /VERSION
COPY /app/ /app/ COPY /app/ /app/
RUN pip install --no-cache-dir -r requirements.txt RUN pip install --no-cache-dir -r requirements.txt

View File

@@ -76,7 +76,7 @@ services:
| `DISCORD_SERVER_NAME` | The name of your server, displayed in notification's footer | A text | Shared for free | | `DISCORD_SERVER_NAME` | The name of your server, displayed in notification's footer | A text | Shared for free |
| `DISCORD_ROLES` | List of Discord roles ID in the same order than `PRODUCT_NAMES` values, found in your discord server settings (with user profile developer mode enabled) | `<@&12345><@&6789>` | @everyone | | `DISCORD_ROLES` | List of Discord roles ID in the same order than `PRODUCT_NAMES` values, found in your discord server settings (with user profile developer mode enabled) | `<@&12345><@&6789>` | @everyone |
| `REFRESH_TIME` | Script refresh interval in seconds | `60`, `30`, etc. | `30` | | `REFRESH_TIME` | Script refresh interval in seconds | `60`, `30`, etc. | `30` |
| `API_URL_SKU` | API listing the product. Use it for development purpose. __Warning__ : it will override the locale set by `COUNTRY`. | An URL | https://api.nvidia.partners/edge/product/search?page=1&limit=100&locale={locale}&Manufacturer=Nvidia` | | `API_URL_SKU` | API listing the product. Use it for development purpose. __Warning__ : it will override the locale set by `COUNTRY`. | An URL | `https://api.nvidia.partners/edge/product/search?page=1&limit=100&locale={locale}&Manufacturer=Nvidia` |
| `API_URL_STOCK` | API providing stock data. Use it for development purpose. __Warning__ : it will override the locale set by `COUNTRY`. | A URL | `https://api.store.nvidia.com/partner/v1/feinventory?locale={locale}&skus=` | | `API_URL_STOCK` | API providing stock data. Use it for development purpose. __Warning__ : it will override the locale set by `COUNTRY`. | A URL | `https://api.store.nvidia.com/partner/v1/feinventory?locale={locale}&skus=` |
| `PRODUCT_URL` | GPU purchase URL. Use it for development purpose. __Warning__ : it will override the locale set by `COUNTRY`. | A URL | `https://marketplace.nvidia.com/fr-fr/consumer/graphics-cards/?locale={locale}&page=1&limit=12&manufacturer=NVIDIA` | | `PRODUCT_URL` | GPU purchase URL. Use it for development purpose. __Warning__ : it will override the locale set by `COUNTRY`. | A URL | `https://marketplace.nvidia.com/fr-fr/consumer/graphics-cards/?locale={locale}&page=1&limit=12&manufacturer=NVIDIA` |
| `TEST_MODE` | For testing without sending notifications | `True`, `False` | `False` | | `TEST_MODE` | For testing without sending notifications | `True`, `False` | `False` |

1
VERSION Normal file
View File

@@ -0,0 +1 @@
4.0.3

View File

@@ -4,7 +4,9 @@ import logging
import json import json
import sys import sys
VERSION = "4.0.1" # Read version from VERSION file
with open(os.path.join(os.path.dirname(os.path.dirname(__file__)), "VERSION"), "r", encoding="utf-8") as f:
VERSION = f.read().strip()
# Logger setup # Logger setup
logging.basicConfig( logging.basicConfig(
@@ -77,23 +79,23 @@ if match:
else: else:
wh_masked_url = "[Invalid webhook URL]" wh_masked_url = "[Invalid webhook URL]"
# HTTP headers # HTTP headers - Firefox working set
HEADERS = { HEADERS = {
"User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) " "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:145.0) Gecko/20100101 Firefox/145.0",
"AppleWebKit/537.36 (KHTML, like Gecko) " "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
"Chrome/131.0.0.0 Safari/537.36", "Accept-Language": "fr,fr-FR;q=0.8,en-US;q=0.5,en;q=0.3",
"Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,"
"image/avif,image/webp,image/apng,*/*;q=0.8",
"Accept-Encoding": "gzip, deflate, br, zstd", "Accept-Encoding": "gzip, deflate, br, zstd",
"Accept-Language": "en-US,en;q=0.5", "Cache-Control": "no-cache",
"Cache-Control": "max-age=0", "Pragma": "no-cache",
"Sec-GPC": "1",
"Connection": "keep-alive", "Connection": "keep-alive",
"Upgrade-Insecure-Requests": "1",
"Sec-Fetch-Dest": "document", "Sec-Fetch-Dest": "document",
"Sec-Fetch-Mode": "navigate", "Sec-Fetch-Mode": "navigate",
"Sec-Fetch-Site": "none", "Sec-Fetch-Site": "none",
"Sec-Fetch-User": "?1", "Sec-Fetch-User": "?1",
"Upgrade-Insecure-Requests": "1", "Priority": "u=0, i",
"Sec-GPC": "1", "TE": "trailers"
} }
# Load country setting and localization config # Load country setting and localization config

View File

@@ -1,13 +1,17 @@
import requests import requests
import logging import logging
import time
import random
from env_config import HEADERS, PRODUCT_NAMES, API_URL_SKU, API_URL_STOCK, PRODUCT_URL from env_config import HEADERS, PRODUCT_NAMES, API_URL_SKU, API_URL_STOCK, PRODUCT_URL
from notifier import send_discord_notification, send_out_of_stock_notification, send_sku_change_notification from notifier import send_discord_notification, send_out_of_stock_notification, send_sku_change_notification
from requests.adapters import HTTPAdapter, Retry from requests.adapters import HTTPAdapter, Retry
# HTTP session # HTTP session with stealth configuration
session = requests.Session() session = requests.Session()
retries = Retry(total=5, backoff_factor=1, status_forcelist=[500, 502, 503, 504]) retries = Retry(total=2, backoff_factor=3, status_forcelist=[500, 502, 503, 504, 429])
session.mount('https://', HTTPAdapter(max_retries=retries)) adapter = HTTPAdapter(max_retries=retries, pool_connections=1, pool_maxsize=1)
session.mount('https://', adapter)
session.headers.update(HEADERS)
# Keeping memory of last run # Keeping memory of last run
last_sku_dict = {} last_sku_dict = {}
@@ -18,12 +22,53 @@ first_run_dict = {name: True for name in PRODUCT_NAMES}
def check_rtx_50_founders(): def check_rtx_50_founders():
global last_sku_dict, global_stock_status_dict, first_run_dict global last_sku_dict, global_stock_status_dict, first_run_dict
# First get Akamai cookie by visiting main site
try:
logging.info("Getting Akamai protection cookie...")
session.get("https://marketplace.nvidia.com/fr-fr/consumer/graphics-cards/", timeout=10)
time.sleep(1) # Let the session establish
except Exception as e:
logging.warning(f"Failed to get initial cookie: {e}")
# Fetching nvidia API data # Fetching nvidia API data
try: try:
response = session.get(API_URL_SKU, headers=HEADERS, timeout=10) sku_url = API_URL_SKU
response = session.get(sku_url, timeout=10)
logging.info(f"SKU API response: {response.status_code}") logging.info(f"SKU API response: {response.status_code}")
if response.status_code == 429:
logging.warning("Rate limited, waiting longer...")
time.sleep(random.uniform(10, 20))
return
response.raise_for_status() response.raise_for_status()
# Debug response content
logging.info(f"Content-Type: {response.headers.get('Content-Type')}")
logging.info(f"Content-Length: {response.headers.get('Content-Length')}")
logging.info(f"Response text length: {len(response.text)}")
logging.info(f"Response content (first 300 chars): {response.text[:300]}")
# Check if content looks like JSON
if not response.text.strip().startswith('{'):
logging.error("Response doesn't start with '{' - not JSON!")
logging.error(f"Full response: {response.text}")
return
try:
data = response.json() data = response.json()
except Exception as e:
logging.error(f"JSON decode error: {e}")
logging.error(f"Full response text: {response.text}")
return
except requests.exceptions.ReadTimeout:
logging.error("Read timeout - IP may be rate limited/blocked. Try changing IP or wait several hours.")
return
except requests.exceptions.ConnectionError as e:
if "Failed to resolve" in str(e):
logging.error("DNS resolution failed - IP may be DNS blacklisted. Try VPN or different DNS servers.")
else:
logging.error(f"Connection error: {e}")
return
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
logging.error(f"SKU API error: {e}") logging.error(f"SKU API error: {e}")
return return
@@ -34,12 +79,17 @@ def check_rtx_50_founders():
for product_name in PRODUCT_NAMES: for product_name in PRODUCT_NAMES:
product_details = None product_details = None
for p in all_products: for p in all_products:
if p.get("gpu", "").strip() == product_name: gpu_name = p.get("gpu", "").strip()
# Flexible matching: exact match or partial match
if gpu_name == product_name or product_name in gpu_name:
product_details = p product_details = p
break break
if not product_details: if not product_details:
logging.warning(f"⚠️ No product with GPU '{product_name}' found.") logging.warning(f"⚠️ No product with GPU '{product_name}' found.")
# Debug: show available GPU names for troubleshooting
available_gpus = set(p.get("gpu", "") for p in all_products if p.get("gpu"))
logging.info(f"Available GPUs: {sorted(list(available_gpus))[:10]}") # Show first 10
continue continue
product_sku = product_details['productSKU'] product_sku = product_details['productSKU']
@@ -57,12 +107,15 @@ def check_rtx_50_founders():
first_run_dict[product_name] = False first_run_dict[product_name] = False
# Check product availability in API_URL_STOCK for each SKU # Check product availability in API_URL_STOCK for each SKU
api_stock_url = API_URL_STOCK + product_sku api_stock_url = f"{API_URL_STOCK}{product_sku}"
logging.info(f"[{product_name}] Checking stock: {api_stock_url}") logging.info(f"[{product_name}] Checking stock: {api_stock_url}")
try: try:
response = session.get(api_stock_url, headers=HEADERS, timeout=10) response = session.get(api_stock_url, timeout=10)
logging.info(f"[{product_name}] Stock API response: {response.status_code}") logging.info(f"[{product_name}] Stock API response: {response.status_code}")
if response.status_code == 429:
logging.warning(f"[{product_name}] Rate limited, skipping...")
continue
response.raise_for_status() response.raise_for_status()
stock_data = response.json() stock_data = response.json()
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e: