warp-beacon 2.6.88__tar.gz → 2.6.90__tar.gz

{warp_beacon-2.6.88/warp_beacon.egg-info → warp_beacon-2.6.90}/PKG-INFO

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

warp_beacon-2.6.90/warp_beacon/__version__.py

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

{warp_beacon-2.6.88 → warp_beacon-2.6.90}/warp_beacon/scraper/__init__.py

@@ -150,6 +150,7 @@ class AsyncDownloader(object):
 							actor.auth_event = self.auth_event
 							actor.status_pipe = self.status_pipe
 							actor.yt_validate_event = self.yt_validate_event
+							actor.acc_selector = selector
 							# job retry loop
 							while self.allow_loop.value == 1:
 								try:

{warp_beacon-2.6.88 → warp_beacon-2.6.90}/warp_beacon/scraper/abstract.py

@@ -16,6 +16,8 @@ import requests.packages.urllib3.util.connection as urllib3_cn
 if TYPE_CHECKING:
 	from multiprocessing.synchronize import Event as EventType
 
+from warp_beacon.scraper.account_selector import AccountSelector
+
 class ScraperAbstract(ABC):
 	def __init__(self, account: tuple, proxy: dict = None) -> None:
 		self.original_gai_family = None
@@ -24,6 +26,7 @@ class ScraperAbstract(ABC):
 		self.status_pipe: multiprocessing.connection.Connection = None
 		self.yt_validate_event: EventType = None
 		self.auth_event = None
+		self.acc_selector: AccountSelector = None
 		self.account = None
 		self.account_index = 0
 		self.proxy = None

{warp_beacon-2.6.88 → warp_beacon-2.6.90}/warp_beacon/scraper/account_selector.py

@@ -271,4 +271,11 @@ class AccountSelector(object):
 				#if random.random() > 0.95:
 				#	self.ig_accounts_session_id[idx] = str(uuid.uuid4())
 				#	logging.info("Rotated client_session_id — simulating app restart")
-			return self.ig_accounts_session_id[idx]
+			return self.ig_accounts_session_id[idx]
+		
+	def generate_new_session_id(self) -> str:
+		with self.lock:
+			idx = self.account_index[self.current_module_name].value
+			session_id = str(uuid.uuid4())
+			self.ig_accounts_session_id[idx] = session_id
+			return session_id

{warp_beacon-2.6.88 → warp_beacon-2.6.90}/warp_beacon/scraper/instagram/instagram.py

@@ -208,14 +208,24 @@ class InstagramScraper(ScraperAbstract):
 			except exceptions.LoginRequired as e:
 				logging.error("LoginRequired occurred in download handler!")
 				logging.exception(e)
-				old_session = self.cl.get_settings()
-				self.cl.set_settings({})
-				self.setup_device()
-				self.cl.set_uuids(old_session["uuids"])
-				if os.path.exists(self.inst_session_file):
-					os.unlink(self.inst_session_file)
-				time.sleep(5)
-				self.load_session()
+				relogin_success = False
+				if self.cl.relogin_attempt > 1:
+					try:
+						relogin_success = self.cl.relogin()
+					except Exception as exc:
+						logging.warning("Relogin failed!", exc_info=exc)
+				if not relogin_success:
+					old_session = self.cl.get_settings()
+					# change session id after relogin
+					self.client_session_id = self.acc_selector.generate_new_session_id()
+					old_session["uuids"]["client_session_id"] = self.client_session_id
+					self.cl.set_settings({})
+					self.setup_device()
+					self.cl.set_uuids(old_session["uuids"])
+					if os.path.exists(self.inst_session_file):
+						os.unlink(self.inst_session_file)
+					time.sleep(random.uniform(5, 10))
+					self.load_session()
 			except AssertionError as e:
 				raise IGRateLimitOccurred("IG rate limit occurred")
 			except (socket.timeout,

warp_beacon-2.6.90/warp_beacon/warp_beacon.py

@@ -0,0 +1,39 @@
+import os
+import sys
+import uuid
+import secrets
+import hashlib
+import argparse
+
+from warp_beacon.telegram.bot import Bot
+
+#import logging
+
+def generate_uuid() -> str:
+	return str(uuid.uuid4())
+
+def generate_device_id(seed: str = None) -> str:
+	raw = secrets.token_hex(8) if not seed else seed.encode()
+	hex_part = hashlib.md5(raw).hexdigest()[:16]
+	return f"android-{hex_part}"
+
+def main() -> None:
+	parser = argparse.ArgumentParser(description="Warp Beacon Telegram bot.")
+	parser.add_argument("--uuid", action="store_true", help="Generate UUID")
+	parser.add_argument("--generate-device-id", type=str, metavar="INSTAGRAM_LOGIN", help="Generate device_id with account login")
+
+	args = parser.parse_args()
+
+	if args.uuid:
+		print(generate_uuid())
+	elif args.generate_device_id:
+		print(generate_device_id(args.generate_device_id))
+	else:
+		bot = Bot(
+			tg_bot_name=os.environ.get("TG_BOT_NAME", default=None),
+			tg_token=os.environ.get("TG_TOKEN", default=None),
+			tg_api_id=os.environ.get("TG_API_ID", default=None),
+			tg_api_hash=os.environ.get("TG_API_HASH", default=None)
+		)
+		bot.start()
+	sys.exit(0)

{warp_beacon-2.6.88 → warp_beacon-2.6.90/warp_beacon.egg-info}/PKG-INFO

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

warp_beacon-2.6.88/warp_beacon/__version__.py

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

warp_beacon-2.6.88/warp_beacon/warp_beacon.py

@@ -1,14 +0,0 @@
-import os
-
-from warp_beacon.telegram.bot import Bot
-
-#import logging
-
-def main() -> None:
-	bot = Bot(
-		tg_bot_name=os.environ.get("TG_BOT_NAME", default=None),
-		tg_token=os.environ.get("TG_TOKEN", default=None),
-		tg_api_id=os.environ.get("TG_API_ID", default=None),
-		tg_api_hash=os.environ.get("TG_API_HASH", default=None)
-	)
-	bot.start()