warp-beacon 2.6.80__py3-none-any.whl → 2.6.82__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.6.80"
+__version__ = "2.6.82"
 

warp_beacon/scraper/instagram/wb_instagrapi.py

@@ -1,6 +1,6 @@
 import logging
 from typing import Callable
-from urllib.parse import urlparse
+from urllib.parse import urlparse, parse_qs, urlencode, urlunparse
 from pathlib import Path
 import requests
 
@@ -14,20 +14,59 @@ class WBClient(Client):
 	def __init__(self) -> None:
 		super().__init__()
 		self.progress_callback = None
+		self.session = requests.Session()
+		# may be I should remove '"Sec-Fetch-*", "Upgrade-Insecure-Requests", "DNT"' ?
+		self.session.headers.update({
+			"User-Agent": (
+				"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
+				"(KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36"
+			),
+			"Accept": (
+				"text/html,application/xhtml+xml,application/xml;"
+				"q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8"
+			),
+			"Accept-Language": "en-US,en;q=0.9",
+			"Accept-Encoding": "gzip, deflate, br",
+			"Referer": "https://www.instagram.com/",
+			"Connection": "keep-alive",
+			"Sec-Fetch-Site": "same-origin",
+			"Sec-Fetch-Mode": "navigate",
+			"Sec-Fetch-User": "?1",
+			"Sec-Fetch-Dest": "document",
+			"Upgrade-Insecure-Requests": "1",
+			"DNT": "1",
+		})
+		self.essential_params = {"oe", "oh", "_nc_ht", "_nc_cat", "_nc_oc", "_nc_ohc", "_nc_gid"}
 
 	def set_progress_callback(self, callback: Callable[[int | None, int, Path], None]) -> None:
 		if not callback or not callable(callback):
 			raise TypeError("Progress callback must be callable")
 		self.progress_callback = callback
 
+	def sanitize_instagram_url(self, url: str) -> str:
+		parsed = urlparse(url)
+		query = parse_qs(parsed.query)
+		filtered_query = {k: v for k, v in query.items() if k in self.essential_params}
+		new_query = urlencode(filtered_query, doseq=True)
+		return urlunparse(parsed._replace(query=new_query))
+
 	def video_download_by_url(self, url: str, filename: str = "", folder: Path = "") -> Path:
+		url = self.sanitize_instagram_url(url)
 		fname = urlparse(url).path.rsplit("/", 1)[1]
 		filename = f"{filename}.{fname.rsplit('.', 1)[1]}" if filename else fname
 		path = Path(folder or Path.cwd()) / filename
 
 		logging.info("Downloading video from '%s' to '%s'", url, path)
 
-		response = requests.get(url, stream=True, timeout=self.request_timeout)
+		prepared = self.session.prepare_request(requests.Request("GET", url))
+		logging.info("Prepared headers: %s", prepared.headers)
+		response = self.session.send(
+			prepared,
+			stream=True,
+			verify=False,
+			proxies=self.public.proxies,
+			timeout=self.request_timeout
+		)
 		response.raise_for_status()
 		logging.info("Response headers: %s", response.headers)
 
@@ -64,13 +103,23 @@ class WBClient(Client):
 	def photo_download_by_url(
 		self, url: str, filename: str = "", folder: Path = ""
 	) -> Path:
+		url = self.sanitize_instagram_url(url)
 		fname = urlparse(url).path.rsplit("/", 1)[1]
 		filename = f"{filename}.{(filename, fname.rsplit('.', 1)[1]) if filename else fname}"
 		path = Path(folder) / filename
 
 		logging.info("Downloading photo from '%s' to '%s'", url, path)
-
-		response = requests.get(url, stream=True, timeout=self.request_timeout)
+		logging.info("[Downloader] Using proxies: %s", self.public.proxies)
+
+		prepared = self.session.prepare_request(requests.Request("GET", url))
+		logging.info("Prepared headers: %s", prepared.headers)
+		response = self.session.send(
+			prepared,
+			stream=True,
+			verify=False,
+			proxies=self.public.proxies,
+			timeout=self.request_timeout
+		)
 		response.raise_for_status()
 		logging.info("Response headers: %s", response.headers)
 

{warp_beacon-2.6.80.dist-info → warp_beacon-2.6.82.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warp_beacon
-Version: 2.6.80
+Version: 2.6.82
 Summary: Telegram bot for expanding external media links
 Home-page: https://github.com/sb0y/warp_beacon
 Author: Andrey Bagrintsev

{warp_beacon-2.6.80.dist-info → warp_beacon-2.6.82.dist-info}/RECORD

@@ -4,7 +4,7 @@ var/warp_beacon/accounts.json,sha256=OsXdncs6h88xrF_AP6_WDCK1waGBn9SR-uYdIeK37GM
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 var/warp_beacon/proxies.json,sha256=VnjlQDXumOEq72ZFjbh6IqHS1TEHqn8HPYAZqWCeSIA,95
 warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
-warp_beacon/__version__.py,sha256=kvDm0WiNzfBEEx2MfO-Lv3MLK6uB47vcVOP4hBiaBig,24
+warp_beacon/__version__.py,sha256=nX1HTS4zhGP6XRS5AnrBku-hDOjJ2Xz_qNLtH0Nr9_M,24
 warp_beacon/warp_beacon.py,sha256=ED43vNzdjDUJ_9qLCbri0bjWLWEJ69BENGj9i7G6AvM,342
 warp_beacon/yt_auth.py,sha256=GUTKqYr_tzDC-07Lx_ahWXSag8EyLxXBUnQbDBIkEmk,6022
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -32,7 +32,7 @@ warp_beacon/scraper/utils.py,sha256=xJfCVhiLjVPoFVupE10sTzX7UpgNWbx2EeYIsoYXGDk,
 warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/instagram/captcha.py,sha256=9UYziuqB3Tsat_ET6ex-cnZDbi6yCnsXHSpmE8MuUHk,4651
 warp_beacon/scraper/instagram/instagram.py,sha256=3KhxVQSL3lzovu9hjMA83sCv87u4TTDMfDQrxogoWak,17179
-warp_beacon/scraper/instagram/wb_instagrapi.py,sha256=iRxF4Jacmw4WprpR1Y-XztyKLjuOV22KhpevR1lkdeU,3170
+warp_beacon/scraper/instagram/wb_instagrapi.py,sha256=E1toUKuprUXrHYtnZAb2nK5VnGbW0P_ZHlnp_V95oNo,4922
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/youtube/abstract.py,sha256=K2ovycq1lkx0a2R1FddO3B0IcaVsVzni_fdXzajGdwg,13134
 warp_beacon/scraper/youtube/music.py,sha256=5AeSBQyUgVCJT2hoBCV2WvlyuV9US09SYJhmBG_P9F8,2755
@@ -52,9 +52,9 @@ warp_beacon/telegram/progress_file_reader.py,sha256=e3equyNKlKs764AD-iE9QRsh3YDH
 warp_beacon/telegram/types.py,sha256=Kvdng6uCF1HRoqQgGW1ZYYPJoVuYkFb-LDvMBbW5Hjk,89
 warp_beacon/telegram/utils.py,sha256=1Lq67aRylVJzbwSyvAgjPAGjJZFATkICvAj3TJGuJiM,4635
 warp_beacon/uploader/__init__.py,sha256=j3qcuKhpchseZLGzSsSiogqe6WdMbkK8d3I-ConhNRs,5687
-warp_beacon-2.6.80.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.6.80.dist-info/METADATA,sha256=luqdgCcB6ROKB67zALrZiyfCSXDJdqE5dvMcxZ38lxA,22706
-warp_beacon-2.6.80.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-warp_beacon-2.6.80.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.6.80.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
-warp_beacon-2.6.80.dist-info/RECORD,,
+warp_beacon-2.6.82.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.6.82.dist-info/METADATA,sha256=l1oynk7459iL3wAOoGgKVF8wEi8kDWwyraVOlAaJBVA,22706
+warp_beacon-2.6.82.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+warp_beacon-2.6.82.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.6.82.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
+warp_beacon-2.6.82.dist-info/RECORD,,