xtn-tools-pro 1.0.0.3.1__tar.gz → 1.0.0.3.3__tar.gz

{xtn-tools-pro-1.0.0.3.1/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtn-tools-pro
-Version: 1.0.0.3.1
+Version: 1.0.0.3.3
 Summary: xtn 开发工具
 Author: xtn
 Author-email: czw011122@gmail.com

{xtn-tools-pro-1.0.0.3.1 → xtn-tools-pro-1.0.0.3.3}/setup.py

@@ -15,7 +15,7 @@ with open("README.md", "r") as f:
 
 setuptools.setup(
     name="xtn-tools-pro",  # 模块名称
-    version="1.0.0.3.1",  # 版本
+    version="1.0.0.3.3",  # 版本
     author="xtn",  # 作者
     author_email="czw011122@gmail.com",  # 作者邮箱
     description="xtn 开发工具",  # 模块简介

{xtn-tools-pro-1.0.0.3.1 → xtn-tools-pro-1.0.0.3.3}/xtn_tools_pro/task_pro/go_fun.py

@@ -9,6 +9,7 @@
 # 2025/1/14    xiatn     V00.01.000    新建
 # --------------------------------------------------------------------------------------------------
 import time
+import random
 import inspect
 import requests
 import threading
@@ -27,6 +28,7 @@ class GoFun:
         processes_num = ini_dict.get('processes_num', 0)
         thread_num = ini_dict.get('thread_num', 0)
         restart_time = ini_dict.get('restart_time', 0)
+        update_proxies_time = ini_dict.get('update_proxies_time', 0)
 
         self.__ini_info = {
             "host": host,
@@ -36,10 +38,12 @@ class GoFun:
             "processes_num": processes_num,
             "thread_num": thread_num,
             "restart_time": restart_time,
+            "update_proxies_time": update_proxies_time,
         }
 
         for server_k, server_v in self.__ini_info.items():
-            if not server_v and server_k not in ["port", "processes_num", "thread_num", "restart_time"]:
+            if not server_v and server_k not in ["port", "processes_num", "thread_num", "restart_time",
+                                                 "update_proxies_time"]:
                 raise Exception(f"ini_dict 配置 {server_k} 不存在")
 
         if port:
@@ -49,10 +53,12 @@ class GoFun:
 
         download_url = task_host + "/filter_server/phone/get"
         upload_url = task_host + "/filter_server/phone/update"
+        update_proxy_url = task_host + f"/filter_server/proxy/random/get?taskType={task}&limit=1"
         external_ip = self.__get_external_ip()
 
         self.__ini_info["download_url"] = download_url
         self.__ini_info["upload_url"] = upload_url
+        self.__ini_info["update_proxy_url"] = update_proxy_url
         self.__ini_info["external_ip"] = external_ip
 
         self.logger = logger
@@ -61,19 +67,24 @@ class GoFun:
             return
 
         # 共享任务队列
+        manager = multiprocessing.Manager()
         download_queue = multiprocessing.Queue()
         upload_queue = multiprocessing.Queue()
+        proxies_dict = manager.dict()
         download_task_process = multiprocessing.Process(target=self._download_and_upload_task,
-                                                        args=(download_queue, upload_queue, self.__ini_info, logger))
+                                                        args=(download_queue, upload_queue, proxies_dict,
+                                                              self.__ini_info, logger))
         download_task_process.start()
 
         # 根据配置启动任务
         if go_task_function:
             go_task_fun_process = multiprocessing.Process(target=self._go_task_fun_task,
-                                                          args=(download_queue, upload_queue, self.__ini_info,
-                                                                go_task_function, logger))
+                                                          args=(download_queue, upload_queue, proxies_dict,
+                                                                self.__ini_info, go_task_function, logger))
             go_task_fun_process.start()
 
+        download_task_process.join()
+
     def __get_external_ip(self):
         """
             获取当前网络ip
@@ -88,7 +99,7 @@ class GoFun:
             except Exception as e:
                 pass
 
-    def _download_and_upload_task(self, download_queue, upload_queue, ini_info, logger):
+    def _download_and_upload_task(self, download_queue, upload_queue, proxies_dict, ini_info, logger):
         """
             使用两个线程 打开 获取任务、回写任务
         :param queue:
@@ -103,6 +114,8 @@ class GoFun:
         thread_download_task.start()
         thread_upload_task = threading.Thread(target=self.__upload_task, args=(upload_queue, ini_info, logger))
         thread_upload_task.start()
+        thread_update_proxy = threading.Thread(target=self.__update_proxy, args=(proxies_dict, ini_info, logger))
+        thread_update_proxy.start()
 
     def __download_task(self, download_queue, ini_info, logger):
         """
@@ -117,19 +130,23 @@ class GoFun:
         headers = {"Authorization": auto}
         params = {"taskType": task}
         while True:
-            qsize = download_queue.qsize()
-            logger.info(f"获取任务，当前队列任务数：{qsize}")
-            if qsize <= 10:
+            try:
+                qsize = download_queue.qsize()
+                logger.info(f"获取任务，当前队列任务数：{qsize}")
+                if qsize >= 10:
+                    time.sleep(2)
+                    continue
+                resp = requests.get(download_url, headers=headers, params=params, timeout=5)
+                json_data = resp.json()
+                result_list = json_data.get("result", [])
+                for task_item in result_list:
+                    download_queue.put(task_item)
+                logger.info(f"成功获取任务个数：{len(result_list)}")
+            except Exception as e:
+                logger.critical(f"获取任务请求异常：{e}")
                 time.sleep(2)
-                continue
-            resp = requests.get(download_url, headers=headers, params=params, timeout=5)
-            json_data = resp.json()
-            result_list = json_data.get("result", [])
-            for task_item in result_list:
-                download_queue.put(task_item)
-            logger.info(f"成功获取任务个数：{len(result_list)}")
-
-    def __upload_task(self, queue, ini_info, logger):
+
+    def __upload_task(self, upload_queue, ini_info, logger):
         """
             回写任务
         :return:
@@ -142,7 +159,7 @@ class GoFun:
         params = {"taskType": task}
         while True:
             # 判断队列是否有值
-            empty = queue.empty()
+            empty = upload_queue.empty()
             if empty:
                 time.sleep(2)
                 continue
@@ -151,7 +168,7 @@ class GoFun:
             result_list = []
             try:
                 while True:
-                    task_item = queue.get_nowait()
+                    task_item = upload_queue.get_nowait()
                     taskNo = task_item["taskNo"]
                     phone = task_item["phone"]
                     isRegistered = task_item["isRegistered"]
@@ -177,7 +194,43 @@ class GoFun:
                 except Exception as e:
                     logger.critical(f"回写异常,{len(result_list)},{e}")
 
-    def _go_task_fun_task(self, download_queue, upload_queue, ini_info, go_task_function, logger):
+    def __update_proxy(self, proxies_dict, ini_info, logger):
+        """
+            更新代理
+        :return:
+        """
+        update_proxy_url = ini_info["update_proxy_url"]
+        auto = ini_info["auto"]
+        update_proxies_time = ini_info["update_proxies_time"]
+        headers = {"Authorization": auto}
+
+        while True:
+            try:
+                if not proxies_dict.get("status"):
+                    resp = requests.get(update_proxy_url, headers=headers, timeout=5)
+                    json_data = resp.json()
+                    status_code = resp.status_code
+                    result_list = json_data.get("result", [])
+                    if not result_list or status_code != 200:
+                        logger.critical(f"获取代理响应异常：{status_code} {len(result_list)} {json_data}")
+                        time.sleep(2)
+
+                    proxies_dict['http'] = 'http://' + random.choice(result_list)
+                    proxies_dict['https'] = 'http://' + random.choice(result_list)
+                    proxies_dict['status'] = True
+                    logger.info(f"成功获取代理：{proxies_dict}")
+
+                if not update_proxies_time:
+                    # 一直执行 不退出
+                    continue
+
+                time.sleep(update_proxies_time)
+                proxies_dict['status'] = False
+            except Exception as e:
+                logger.critical(f"获取代理请求异常：{e}")
+                time.sleep(2)
+
+    def _go_task_fun_task(self, download_queue, upload_queue, proxies_dict, ini_info, go_task_function, logger):
         """
             单函数，根据配置启动程序
         :param queue:
@@ -206,7 +259,7 @@ class GoFun:
                         f"第{go_task_fun_cnt}次,进程数:{processes_num},线程数:{thread_num},等待{restart_time}秒强制下一次")
                     for i in range(processes_num):
                         p = Process(target=self._run_with_timeout,
-                                    args=(download_queue, upload_queue, thread_num, go_task_function))
+                                    args=(download_queue, upload_queue, proxies_dict, thread_num, go_task_function))
                         processes_start_list.append(p)
                         p.start()
 
@@ -224,7 +277,7 @@ class GoFun:
             except Exception as e:
                 pass
 
-    def _run_with_timeout(self, download_queue, upload_queue, thread_num, go_task_function):
+    def _run_with_timeout(self, download_queue, upload_queue, proxies_dict, thread_num, go_task_function):
         caller = inspect.stack()[1]  # 获取调用者的调用栈信息
         caller_name = caller.function  # 获取调用者的函数名
         caller_class = caller.frame.f_locals.get('self', None)  # 获取调用者的类实例
@@ -233,7 +286,8 @@ class GoFun:
 
         with concurrent.futures.ThreadPoolExecutor(max_workers=thread_num) as executor:
             # 提交10个函数到线程池中执行
-            futures = [executor.submit(go_task_function, download_queue, upload_queue) for _ in range(thread_num)]
+            futures = [executor.submit(go_task_function, download_queue, upload_queue, proxies_dict) for _ in
+                       range(thread_num)]
 
             # 等待所有线程完成
             for future in concurrent.futures.as_completed(futures):

{xtn-tools-pro-1.0.0.3.1 → xtn-tools-pro-1.0.0.3.3/xtn_tools_pro.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtn-tools-pro
-Version: 1.0.0.3.1
+Version: 1.0.0.3.3
 Summary: xtn 开发工具
 Author: xtn
 Author-email: czw011122@gmail.com