warp-beacon 2.6.89__py3-none-any.whl → 2.6.91__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.6.89"
+__version__ = "2.6.91"
 

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/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/scraper/account_selector.py

@@ -60,8 +60,9 @@ class AccountSelector(object):
 
 	def save_ig_sessions_id(self) -> None:
 		try:
-			with open(f"{self.session_dir}/ig_sessions_client_id.json", "w+", encoding="utf-8") as f:
-				f.write(json.dumps(dict(self.ig_accounts_session_id)))
+			with self.lock:
+				with open(f"{self.session_dir}/ig_sessions_client_id.json", "w+", encoding="utf-8") as f:
+					f.write(json.dumps(dict(self.ig_accounts_session_id)))
 		except Exception as e:
 			logging.warning("Failed to save session ig_session_client_id!")
 			logging.exception(e)
@@ -271,4 +272,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/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.89.dist-info → warp_beacon-2.6.91.dist-info}/METADATA

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

{warp_beacon-2.6.89.dist-info → warp_beacon-2.6.91.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=AhxRZFfW4nuV1nG374FacuiUBDMNSLMJmo9LBJyboDs,24
+warp_beacon/__version__.py,sha256=x-o_8g53KASf2TV8bAzbD2eaHaPm0YzBkxIAUR3MBh4,24
 warp_beacon/warp_beacon.py,sha256=ADCR30uGXIsDrt9WoiI9Ghu2QtWs0qZIK6x3pQKM_B4,1109
 warp_beacon/yt_auth.py,sha256=GUTKqYr_tzDC-07Lx_ahWXSag8EyLxXBUnQbDBIkEmk,6022
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -22,16 +22,16 @@ warp_beacon/mediainfo/video.py,sha256=UBZrhTN5IDI-aYu6tsJEILo9nFkjHhkldGVFmvV7tE
 warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scheduler/instagram_human.py,sha256=JF5K8jgdwW0ncpKsEAj2yWMP9Y40kKgCM_i3HoHwNnM,8307
 warp_beacon/scheduler/scheduler.py,sha256=Bf4sGXjX75Dox3q-yzUHhagtzUAj3hl5GzfnZya-_io,4995
-warp_beacon/scraper/__init__.py,sha256=a-nnFAPvXtmJFQJOEbN2UL92FllK_7NTPM3Yoz_hYjk,20103
-warp_beacon/scraper/abstract.py,sha256=_Cr_MaSQ56Wp6n00PcqiM2WDa5DlRKXUnQ9C15bPObw,3692
-warp_beacon/scraper/account_selector.py,sha256=VmXH8SHZqQ6a2mrt2agzDWepE3v46QrFLL3OqVwJ2A4,9731
+warp_beacon/scraper/__init__.py,sha256=k3M0X_m5f7b_DbBB3Ahk62ewEYr5AkqJL0PJXf0G4mI,20140
+warp_beacon/scraper/abstract.py,sha256=pWbaTu-gDZgi-iFjqMR_uGzPl5KLv-4gTdJ9w6cD4sk,3802
+warp_beacon/scraper/account_selector.py,sha256=hl3tvX0FtDbEbSXphUXl7eWTKGFbHJOxqjPcwZZ-n6A,9980
 warp_beacon/scraper/exceptions.py,sha256=EKwoF0oH2xZWbNU-v8DOaWK5skKwa3s1yTIBdlcfMpc,1452
 warp_beacon/scraper/fail_handler.py,sha256=zcPK3ZVEsu6JmHYcWP7L3naTRK3gWFVRkpP84VBOtJs,964
 warp_beacon/scraper/link_resolver.py,sha256=Rc9ZuMyOo3iPywDHwjngy-WRQ2SXhJwxcg-5ripx7tM,2447
 warp_beacon/scraper/utils.py,sha256=Kk_lDmdJiCSaHmOV80OFK05O1wRL2H0agH98JiO8dyg,1268
 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=64XxGui7bPuiJT-Hqlg1KQT9GsbX1YMXzEUJdzvkxLQ,17141
+warp_beacon/scraper/instagram/instagram.py,sha256=4dhan3PO1dT8lCxHD5bdNuEvgutcNvYqxDNG93Wlkkg,17583
 warp_beacon/scraper/instagram/wb_instagrapi.py,sha256=OECHz1eK6J5bfw2H84CdywwxBNegkNb_UhDr0MtNtZ4,5237
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/youtube/abstract.py,sha256=0ub4O8kNBzcrYCbMaNoNQzwE5vBdpNcSYNtxT-cBXe4,15024
@@ -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.89.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.6.89.dist-info/METADATA,sha256=a3IGbK9FA8yZZxisbuboczOGs5zPXZKUmyN6PYhHmUo,22736
-warp_beacon-2.6.89.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-warp_beacon-2.6.89.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.6.89.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
-warp_beacon-2.6.89.dist-info/RECORD,,
+warp_beacon-2.6.91.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.6.91.dist-info/METADATA,sha256=9vCEK4emG8JVlHjucbJuZ0Y3pbVLyz_AhaRBG8Gui2g,22736
+warp_beacon-2.6.91.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+warp_beacon-2.6.91.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.6.91.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
+warp_beacon-2.6.91.dist-info/RECORD,,