FongMi 5以上版本支持

.github/workflows/run.yml

@@ -27,8 +27,6 @@ jobs:
       #      cd ../
       #   shell: bash
       - name: xiaosa tools
-        env:
-          CF_PROXY_URL: ${{ secrets.CF_PROXY_URL }}
         run: |
           pwd
           cd tools/

tools/build_local.py

@@ -137,7 +137,28 @@ class TVBox本地构建器:
         print(f"\n=== 下载 Spider ===")
         url = self.替换代理域名(url)
 
-        # 方案1: 用 requests 下载
+        # 方案1: 通过 CF Worker 代理下载（优先）
+        cf_proxy = 'https://wild-butterfly-88a5.juestnow.workers.dev'
+        try:
+            proxy_url = f"{cf_proxy}?q={url}"
+            print(f"  下载(cf-proxy): {proxy_url[:80]}...")
+            resp = self.session.get(proxy_url, timeout=60, allow_redirects=True)
+            resp.raise_for_status()
+            content = resp.content
+            if len(content) > 1000 and content[:2] == b'PK':
+                with open(spider_path, 'wb') as f:
+                    f.write(content)
+                md5 = self.计算MD5(spider_path)
+                print(f"  ✓ cf-proxy保存到: {spider_path}")
+                print(f"  MD5: {md5}")
+                self.数据['spider'] = f"./spider.jar;md5;{md5}"
+                return True
+            else:
+                print(f"  ✗ cf-proxy返回内容非有效jar (大小: {len(content)})")
+        except Exception as e:
+            print(f"  ✗ cf-proxy下载失败: {e}")
+
+        # 方案2: 用 requests 直接下载
         try:
             print(f"  下载(requests): {url}")
             resp = self.session.get(url, timeout=30, allow_redirects=True)
@@ -152,29 +173,6 @@ class TVBox本地构建器:
         except Exception as e:
             print(f"  ✗ requests下载失败: {e}")
 
-        # 方案2: 通过 CF Worker 代理下载
-        cf_proxy = os.environ.get('CF_PROXY_URL', '')
-        if cf_proxy:
-            try:
-                proxy_url = f"{cf_proxy}?q={url}"
-                print(f"  下载(cf-proxy): {proxy_url[:80]}...")
-                resp = self.session.get(proxy_url, timeout=60, allow_redirects=True)
-                resp.raise_for_status()
-                content = resp.content
-                # 检查是否为有效 jar 文件（PK 开头 = zip/jar）
-                if len(content) > 1000 and content[:2] == b'PK':
-                    with open(spider_path, 'wb') as f:
-                        f.write(content)
-                    md5 = self.计算MD5(spider_path)
-                    print(f"  ✓ cf-proxy保存到: {spider_path}")
-                    print(f"  MD5: {md5}")
-                    self.数据['spider'] = f"./spider.jar;md5;{md5}"
-                    return True
-                else:
-                    print(f"  ✗ cf-proxy返回内容非有效jar (大小: {len(content)})")
-            except Exception as e:
-                print(f"  ✗ cf-proxy下载失败: {e}")
-
         # 方案3: 使用已有的 spider.jar（从上级目录查找）
         import shutil
         for candidate in [Path('../xiaosa/spider.jar'), Path('../jar/spider.jar'), Path('spider.jar')]:

tools/tvbox.py

@@ -40,107 +40,110 @@ class 文件加解密器:
                     encoded_netloc = quote(parsed.netloc, safe='')
                     url = parsed._replace(netloc=encoded_netloc).geturl()
 
-            req = Request(url, headers={
+            # 优先通过 CF Worker 代理下载
-                'User-Agent': 'okhttp/3.12.0',
+            cf_proxy = 'https://wild-butterfly-88a5.juestnow.workers.dev'
-                'Accept-Encoding': 'gzip, deflate'
+            proxy_url = f"{cf_proxy}?q={url}"
-            })
+            try:
-            with urlopen(req, timeout=30) as response:
+                req = Request(proxy_url, headers={
-                raw_content = response.read()
+                    'User-Agent': 'okhttp/3.12.0',
+                    'Accept-Encoding': 'gzip, deflate'
+                })
+                with urlopen(req, timeout=30) as response:
+                    raw_content = response.read()
+            except Exception as cf_err:
+                print(f"  CF代理失败，尝试直连: {cf_err}")
+                req = Request(url, headers={
+                    'User-Agent': 'okhttp/3.12.0',
+                    'Accept-Encoding': 'gzip, deflate'
+                })
+                with urlopen(req, timeout=30) as response:
+                    raw_content = response.read()
 
-                # 检查是否为图片或二进制文件
+            # 检查文件头是否为常见图片格式
-                content_type = response.headers.get('Content-Type', '')
+            image_headers = [
-                if content_type.startswith('image/') or content_type.startswith('video/') or content_type.startswith('audio/'):
+                b'\xff\xd8\xff\xe0',  # JPEG
-                    print(f"  检测到{content_type}类型，尝试提取嵌入的数据...")
+                b'\xff\xd8\xff\xe1',  # JPEG
+                b'\x89PNG',           # PNG
+                b'GIF87a',            # GIF
+                b'GIF89a',            # GIF
+                b'BM',                # BMP
+            ]
+            is_image = False
+            for header in image_headers:
+                if raw_content.startswith(header):
+                    is_image = True
+                    break
 
-                # 检查文件头是否为常见图片格式
+            # 如果是图片，尝试提取嵌入的base64数据
-                image_headers = [
+            if is_image:
-                    b'\xff\xd8\xff\xe0',  # JPEG
+                print(f"  检测到图片文件，尝试提取嵌入的base64数据...")
-                    b'\xff\xd8\xff\xe1',  # JPEG
+                try:
-                    b'\x89PNG',           # PNG
+                    # 转为文本查找base64数据
-                    b'GIF87a',            # GIF
+                    text_content = raw_content.decode('latin-1')
-                    b'GIF89a',            # GIF
+                    # 查找长base64字符串（至少50个字符）
-                    b'BM',                # BMP
+                    base64_pattern = r'[A-Za-z0-9+/=]{50,}'
-                ]
+                    match = re.search(base64_pattern, text_content)
-                is_image = False
+                    if match:
-                for header in image_headers:
+                        base64_str = match.group(0)
-                    if raw_content.startswith(header):
+                        print(f"  找到base64数据，长度: {len(base64_str)}")
-                        is_image = True
+                        decoded = base64.b64decode(base64_str)
-                        break
+                        # 将解码后的内容转为字符串
+                        for encoding in ['utf-8', 'gbk', 'gb2312', 'latin-1']:
+                            try:
+                                content = decoded.decode(encoding)
+                                print(f"✓ 成功提取图片中的base64数据 ({len(content)} 字节)")
+                                return content
+                            except UnicodeDecodeError:
+                                continue
+                except Exception as e:
+                    print(f"  提取图片数据失败: {e}")
 
-                # 如果是图片，尝试提取嵌入的base64数据
+            # 处理gzip解压
-                if is_image:
+            if 处理gzip:
-                    print(f"  检测到图片文件，尝试提取嵌入的base64数据...")
+                try:
+                    raw_content = gzip.decompress(raw_content)
+                    print(f"  ✓ gzip解压成功")
+                except:
+                    # 不是gzip格式，继续处理
+                    pass
+
+            # 尝试多种编码解码
+            content = None
+            for encoding in ['utf-8', 'gbk', 'gb2312', 'latin-1']:
+                try:
+                    content = raw_content.decode(encoding)
+                    break
+                except UnicodeDecodeError:
+                    continue
+
+            if content is None:
+                content = raw_content.decode('latin-1')
+
+            # 处理base64解码（仅当内容看起来像base64且不是hex数据时）
+            if 处理base64:
+                # 检查是否为hex数据（只包含0-9, a-f, A-F）
+                stripped = content.strip()
+                is_hex = re.match(r'^[0-9a-fA-F]+$', stripped) is not None
+
+                if not is_hex:
                     try:
-                        # 转为文本查找base64数据
+                        decoded = base64.b64decode(content)
-                        text_content = raw_content.decode('latin-1')
+                        try:
-                        # 查找长base64字符串（至少50个字符）
+                            decoded = gzip.decompress(decoded)
-                        base64_pattern = r'[A-Za-z0-9+/=]{50,}'
+                            print(f"  ✓ base64+gzip解码成功")
-                        match = re.search(base64_pattern, text_content)
+                        except:
-                        if match:
+                            print(f"  ✓ base64解码成功")
-                            base64_str = match.group(0)
+                        for encoding in ['utf-8', 'gbk', 'gb2312', 'latin-1']:
-                            print(f"  找到base64数据，长度: {len(base64_str)}")
+                            try:
-                            decoded = base64.b64decode(base64_str)
+                                content = decoded.decode(encoding)
-                            # 将解码后的内容转为字符串
+                                break
-                            for encoding in ['utf-8', 'gbk', 'gb2312', 'latin-1']:
+                            except UnicodeDecodeError:
-                                try:
+                                continue
-                                    content = decoded.decode(encoding)
-                                    print(f"✓ 成功提取图片中的base64数据 ({len(content)} 字节)")
-                                    return content
-                                except UnicodeDecodeError:
-                                    continue
-                    except Exception as e:
-                        print(f"  提取图片数据失败: {e}")
-
-                # 处理gzip解压
-                if 处理gzip:
-                    try:
-                        raw_content = gzip.decompress(raw_content)
-                        print(f"  ✓ gzip解压成功")
                     except:
-                        # 不是gzip格式，继续处理
                         pass
 
-                # 尝试多种编码解码
+            print(f"✓ 成功获取URL内容 ({len(content)} 字节)")
-                content = None
+            return content
-                for encoding in ['utf-8', 'gbk', 'gb2312', 'latin-1']:
-                    try:
-                        content = raw_content.decode(encoding)
-                        break
-                    except UnicodeDecodeError:
-                        continue
-
-                if content is None:
-                    content = raw_content.decode('latin-1')
-
-                # 处理base64解码（仅当内容看起来像base64且不是hex数据时）
-                if 处理base64:
-                    # 检查是否为hex数据（只包含0-9, a-f, A-F）
-                    stripped = content.strip()
-                    is_hex = re.match(r'^[0-9a-fA-F]+$', stripped) is not None
-
-                    if not is_hex:
-                        try:
-                            # 尝试base64解码
-                            decoded = base64.b64decode(content)
-                            # 解码后再次尝试gzip解压
-                            try:
-                                decoded = gzip.decompress(decoded)
-                                print(f"  ✓ base64+gzip解码成功")
-                            except:
-                                print(f"  ✓ base64解码成功")
-                            # 将解码后的内容转为字符串
-                            for encoding in ['utf-8', 'gbk', 'gb2312', 'latin-1']:
-                                try:
-                                    content = decoded.decode(encoding)
-                                    break
-                                except UnicodeDecodeError:
-                                    continue
-                        except:
-                            # 不是base64格式，继续使用原内容
-                            pass
-
-                print(f"✓ 成功获取URL内容 ({len(content)} 字节)")
-                return content
         except Exception as e:
             print(f"✗ 获取URL内容失败: {e}")
             return None