warp-beacon 2.6.86__tar.gz → 2.6.87__tar.gz

{warp_beacon-2.6.86/warp_beacon.egg-info → warp_beacon-2.6.87}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warp_beacon
-Version: 2.6.86
+Version: 2.6.87
 Summary: Telegram bot for expanding external media links
 Home-page: https://github.com/sb0y/warp_beacon
 Author: Andrey Bagrintsev
@@ -241,6 +241,7 @@ Requires-Dist: yt_dlp
 Requires-Dist: pydub
 Requires-Dist: SpeechRecognition
 Requires-Dist: playwright
+Requires-Dist: fake-useragent
 Dynamic: author
 Dynamic: home-page
 Dynamic: license-file

{warp_beacon-2.6.86 → warp_beacon-2.6.87}/pyproject.toml

@@ -29,7 +29,8 @@ dependencies = [
 	"yt_dlp",
 	"pydub",
 	"SpeechRecognition",
-	"playwright"
+	"playwright",
+	"fake-useragent"
 ]
 keywords = ["bot", "telegram", "instagram", "export"]
 classifiers = [

warp_beacon-2.6.87/warp_beacon/__version__.py

@@ -0,0 +1,2 @@
+__version__ = "2.6.87"
+

{warp_beacon-2.6.86 → warp_beacon-2.6.87}/warp_beacon/scraper/instagram/instagram.py

@@ -31,6 +31,7 @@ from warp_beacon.jobs.download_job import DownloadJob
 from warp_beacon.telegram.utils import Utils
 from warp_beacon.scraper.instagram.wb_instagrapi import WBClient
 from warp_beacon.telegram.types import ReportType
+from warp_beacon.scraper.utils import ScraperUtils
 
 INST_SESSION_FILE_TPL = "/var/warp_beacon/inst_session_account_%d.json"
 
@@ -61,10 +62,7 @@ class InstagramScraper(ScraperAbstract):
 			"Accept": "*/*",
 			"Accept-Encoding": "gzip, deflate, br",
 			"Accept-Language": "en-US,en;q=0.9",
-			"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"
-			)
+			"User-Agent": ScraperUtils.get_ua()
 		})
 		self.cl.set_progress_callback(self.download_progress)
 
@@ -96,7 +94,7 @@ class InstagramScraper(ScraperAbstract):
 			"uuid": uuids.get("uuid", self.cl.generate_uuid()),
 			"client_session_id": self.client_session_id,
 			"advertising_id": uuids.get("advertising_id", self.cl.generate_uuid()),
-			"device_id": uuids.get("device_id", self.cl.generate_uuid())
+			"device_id": uuids.get("device_id", self.cl.generate_android_device_id())
 		})
 
 	def safe_write_session(self) -> None:

{warp_beacon-2.6.86 → warp_beacon-2.6.87}/warp_beacon/scraper/instagram/wb_instagrapi.py

@@ -7,6 +7,8 @@ import requests
 from instagrapi import Client
 from instagrapi.exceptions import VideoNotDownload
 
+from warp_beacon.scraper.utils import ScraperUtils
+
 class WBClient(Client):
 	"""
 	patched instagrapi
@@ -17,10 +19,7 @@ class WBClient(Client):
 		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"
-			),
+			"User-Agent": ScraperUtils.get_ua(),
 			"Accept": (
 				"text/html,application/xhtml+xml,application/xml;"
 				"q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8"
@@ -29,12 +28,12 @@ class WBClient(Client):
 			"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",
+			#"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"}
 

warp_beacon-2.6.87/warp_beacon/scraper/utils.py

@@ -0,0 +1,20 @@
+import logging
+
+from fake_useragent import UserAgent
+
+class ScraperUtils(object):
+	@staticmethod
+	def get_ua_dict() -> dict:
+		random_client = None
+		try:
+			ua = UserAgent(browsers=['Facebook', 'Android'], platforms=['mobile', 'tablet'], os=['Android', 'iOS'])
+			random_client = ua.getRandom
+			logging.info("Select random UA: %s", random_client)
+		except Exception as e:
+			logging.warning("Exception occurrd while generating random client UA!", exc_info=e)
+			random_client = {'useragent': 'Mozilla/5.0 (Linux; Android 14; SM-S911B Build/UP1A.231005.007; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/133.0.6943.117 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/502.0.0.66.79;IABMV/1;]', 'percent': 0.017937771404345798, 'type': 'mobile', 'device_brand': 'Samsung', 'browser': 'Facebook', 'browser_version': '502.0.0', 'browser_version_major_minor': 502.0, 'os': 'Android', 'os_version': '14', 'platform': 'Linux aarch64'}
+		return random_client
+
+	@staticmethod
+	def get_ua() -> str:
+		return ScraperUtils.get_ua_dict()["useragent"]

{warp_beacon-2.6.86 → warp_beacon-2.6.87/warp_beacon.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warp_beacon
-Version: 2.6.86
+Version: 2.6.87
 Summary: Telegram bot for expanding external media links
 Home-page: https://github.com/sb0y/warp_beacon
 Author: Andrey Bagrintsev
@@ -241,6 +241,7 @@ Requires-Dist: yt_dlp
 Requires-Dist: pydub
 Requires-Dist: SpeechRecognition
 Requires-Dist: playwright
+Requires-Dist: fake-useragent
 Dynamic: author
 Dynamic: home-page
 Dynamic: license-file

{warp_beacon-2.6.86 → warp_beacon-2.6.87}/warp_beacon.egg-info/requires.txt

@@ -15,3 +15,4 @@ yt_dlp
 pydub
 SpeechRecognition
 playwright
+fake-useragent

warp_beacon-2.6.86/warp_beacon/__version__.py

@@ -1,2 +0,0 @@
-__version__ = "2.6.86"
-

warp_beacon-2.6.86/warp_beacon/scraper/utils.py

@@ -1,4 +0,0 @@
-#import logging
-
-class Utils(object):
-	pass