Update requirements.txt

feat:优化代码&更清晰的图标

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: ['https://afdian.com/a/ikun0014']

.github/ISSUE_TEMPLATE/bug反馈.md

@@ -0,0 +1,25 @@
+---
+name: Bug反馈
+about: 反馈一个虫子（确信）
+title: "[BUG]: "
+labels: ''
+assignees: ''
+
+---
+
+**触发Bug后出现了什么症状**
+1.
+
+**如何复现该Bug**
+步骤:
+1. 
+
+**日志**
+复制在这里
+
+**截图**
+对程序的完整截图
+
+**系统:**
+ - OS: Windows
+ - Version: 10

.github/workflows/build.yml

@@ -1,71 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  build:
-    runs-on: windows-2019
-    steps:
-    - name: Check out git repository
-      uses: actions/checkout@v4
-
-    # Push tag to GitHub if package.json version's tag is not tagged
-    - name: Get package version
-      shell: powershell
-      run: |
-        $version = (Get-Content package.json | ConvertFrom-Json).version
-        echo "PACKAGE_VERSION=$version" >> $env:GITHUB_ENV
-  
-
-    - name: Set up Python 3.11
-      uses: actions/setup-python@v3
-      with:
-        python-version: 3.11.9
-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.txt
-
-    - name: Build
-      uses: Nuitka/Nuitka-Action@main
-      with:
-        nuitka-version: main
-        script-name: main.py
-        standalone: true
-        onefile: true
-        show-memory: true
-        windows-uac-admin: true
-        windows-icon-from-ico: icon.jpg
-        company-name: ikunshare
-        product-name: Onekey
-        file-version: ${{ env.PACKAGE_VERSION }}
-        product-version: ${{ env.PACKAGE_VERSION }}
-        file-description: 一个Steam仓库清单下载器
-        copyright: Copyright © 2024 ikun0014
-        output-file: Onekey---v${{ env.PACKAGE_VERSION }}.exe
-        assume-yes-for-downloads: true
-        output-dir: build
-
-    - name: Create git tag
-      uses: pkgdeps/git-tag-action@v3
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        github_repo: ${{ github.repository }}
-        version: ${{ env.PACKAGE_VERSION }}
-        git_commit_sha: ${{ github.sha }}
-        git_tag_prefix: "v"
-
-    - name: Release
-      uses: softprops/action-gh-release@v2
-      with:
-        prerelease: false
-        draft: false
-        tag_name: v${{ env.PACKAGE_VERSION }}
-        files: |
-          build/Onekey---v${{ env.PACKAGE_VERSION }}.exe
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -0,0 +1,79 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    permissions:
+      contents: write
+    runs-on: windows-latest
+    steps:
+      - name: Check out git repository
+        uses: actions/checkout@v4
+
+      - name: Get package version
+        shell: powershell
+        run: |
+          $version = (Get-Content package.json | ConvertFrom-Json).version
+          echo "PACKAGE_VERSION=$version" >> $env:GITHUB_ENV
+
+      - name: Create Executable
+        uses: sayyid5416/pyinstaller@main
+        with:
+          python_ver: "3.13.1"
+          spec: "main.py"
+          requirements: "requirements.txt"
+          options: --onefile, --name Onekey_v${{ env.PACKAGE_VERSION }}, --uac-admin, --uac-uiaccess, --icon ./icon.jpg
+
+      - name: Run UPX
+        uses: crazy-max/ghaction-upx@master
+        with:
+          version: latest
+          files: |
+            ./dist/*.exe
+          args: -fq
+
+      - name: Create git tag
+        uses: pkgdeps/git-tag-action@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          github_repo: ${{ github.repository }}
+          version: ${{ env.PACKAGE_VERSION }}
+          git_commit_sha: ${{ github.sha }}
+          git_tag_prefix: "v"
+
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: v${{ env.PACKAGE_VERSION }}
+          files: dist/Onekey_v${{ env.PACKAGE_VERSION }}.exe
+          prerelease: false
+          draft: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Gitee Release
+        uses: nicennnnnnnlee/action-gitee-release@v1.0.5
+        with:
+          gitee_owner: ikun0014
+          gitee_repo: Onekey
+          gitee_token: ${{ secrets.GITEE_TOKEN }}
+          gitee_tag_name: v${{ env.PACKAGE_VERSION }}
+          gitee_release_name: v${{ env.PACKAGE_VERSION }}
+          gitee_release_body: I don't know
+          gitee_target_commitish: main
+          gitee_upload_retry_times: 3
+          gitee_file_name: Onekey_v${{ env.PACKAGE_VERSION }}.exe
+          gitee_file_path: dist/Onekey_v${{ env.PACKAGE_VERSION }}.exe
+
+      - name: Upload to Telegram Channel
+        run: |
+          & curl -F "chat_id=${{ secrets.TELEGRAM_TO }}" `
+              -F "thread_id=${{ secrets.TELEGRAM_THREAD }}" `
+              -F "document=@dist/Onekey_v${{ env.PACKAGE_VERSION }}.exe" `
+              -F "caption=Onekey's New Update ${{ env.PACKAGE_VERSION }}" `
+              -F "parse_mode=Markdown" `
+              "https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendDocument"

.github/workflows/sync.yml

@@ -0,0 +1,25 @@
+name: Sync to Gitee
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  sync:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+    - name: Sync to Gitee
+      uses: Yikun/hub-mirror-action@master
+      with:
+        src: github/ikunshare
+        dst: gitee/ikun0014
+        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
+        dst_token: ${{ secrets.GITEE_TOKEN }}
+        src_account_type: org
+        dst_account_type: user
+        white_list: "Onekey"
+        force_update: true
+        debug: true

.gitignore

@@ -170,3 +170,5 @@ config.json
 *.exe
 *.dll
 /main.dist
+/.vscode
+/.vs

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "python.analysis.autoImportCompletions": true,
+    "python.analysis.typeCheckingMode": "basic"
+}

README.md

@@ -7,18 +7,25 @@
 [![GitHub All Releases](https://img.shields.io/github/downloads/ikunshare/Onekey/total?style=for-the-badge&color=violet)](https://github.com/ikunshare/Onekey/releases)
 [![GitHub License](https://img.shields.io/github/license/ikunshare/Onekey?style=for-the-badge)](https://github.com/ikunshare/Onekey/blob/main/LICENSE)
 
+[![Powered by DartNode](https://dartnode.com/branding/DN-Open-Source-sm.png)](https://dartnode.com "Powered by DartNode - Free VPS for Open Source")
+
 </div>
 
 
 ## Onekey
- Onekey Steam Depot Manifest Downloader
+Onekey Steam Depot Manifest Downloader
+
+## 先让我挂些人
+- 沧海颐粟，早期倒卖大手子，现在不知道跑哪了，通过一点手段查到在景德镇
+- 玩家资源站，这两个月出现的，也是很嚣张了，B站https://space.bilibili.com/242622952，已被拉黑
 
 ## 使用方法
- 先去Release下最新发布，然后去steamtools官网下steamtools，日志会有点石介意别用
+去Releases处下载最新的发布，并且安装好SteamTools或者GreenLuma  
+然后打开Onekey输入App ID即可使用
 
 ## 开发
 本程序使用Python编程语言开发   
-要求环境：   
+要求环境:    
 1.Python 3.10及以上   
 2.Windows 10及以上   
 3.使用Git进行版本管理   
@@ -38,7 +45,7 @@ pip install -r requirements.txt
 ## 项目协议
  本项目基于 GPL-3.0 许可证发行，以下协议是对于 GPL-3.0 原协议的补充，如有冲突，以以下协议为准。
 
- 词语约定：“使用者”指签署本协议的使用者;“版权数据”指包括但不限于图像、音频、名字等在内的他人拥有所属版权的数据。
+ 词语约定: “使用者”指签署本协议的使用者;“版权数据”指包括但不限于图像、音频、名字等在内的他人拥有所属版权的数据。
 
  本项目的数据来源原理是从Steam官方的CDN服务器中拉取游戏清单数据，经过对数据简单地筛选与合并后进行展示，因此本项目不对数据的准确性负责。
  使用本项目的过程中可能会产生版权数据，对于这些版权数据，本项目不拥有它们的所有权，为了避免造成侵权，使用者务必在24 小时内清除使用本项目的过程中所产生的版权数据。
@@ -61,11 +68,10 @@ pip install -r requirements.txt
  </a>
 
 ## 常见问题解答（FAQ）
-查看 [FAQ](https://ikunshare.com/d/49) 获取常见问题的解答。
+查看 [FAQ](https://ikunshare.top/d/49) 获取常见问题的解答。
 
 ## 社区和支持
-加入我们的社区，参与讨论和支持：
+加入我们的社区，参与讨论和支持: 
 - [GitHub Discussions](https://github.com/ikunshare/Onekey/discussions)
-- [Gitter Chat](https://gitter.im/ikunshare/Onekey)
-- [QQ](https://qm.qq.com/q/d7sWovfAGI)
-- [Telegram](https://t.me/ikunshare_group)
+- [Telegram](https://t.me/ikunshare_qun)
+- [QQ](https://qm.qq.com/q/NPRVbglteK)

common/check.py

@@ -1,28 +0,0 @@
-import time
-import ujson as json
-
-from aiohttp import ClientError
-from .log import log
-from .stack_error import stack_error
-
-
-async def check_github_api_rate_limit(headers, session):
-    try:
-        url = 'https://api.github.com/rate_limit'
-
-        async with session.get(url, headers=headers, ssl=False) as r:
-            r_json = await r.json()
-
-            if r.status == 200:
-                rate_limit = r_json['rate']
-                remaining_requests = rate_limit['remaining']
-                reset_time = rate_limit['reset']
-                reset_time_formatted = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(reset_time))
-                log.info(f' 🔄 剩余请求次数: {remaining_requests}')
-            else:
-                log.error('⚠ Github请求数检查失败，网络错误')
-
-        if remaining_requests == 0:
-            log.warning(f'⚠ GitHub API 请求数已用尽，将在 {reset_time_formatted} 重置, 不想等生成一个填配置文件里')
-    except ClientError as e:
-        log.error(f'⚠ 检查Github API 请求数失败，{stack_error(e)}')

common/config.py

@@ -1,52 +0,0 @@
-import os
-import sys
-import asyncio
-import ujson as json
-import aiofiles
-
-from .stack_error import stack_error
-from .log import log
-
-
-async def gen_config_file():
-    try:
-        qa1 = "温馨提示：Github_Personal_Token可在Github设置的最底下开发者选项找到，详情看教程"
-        tutorial = "https://ikunshare.com/Onekey_tutorial"
-        default_config ={
-                        "Github_Personal_Token": "",
-                        "Custom_Steam_Path": "",
-                        "QA1": qa1,
-                        "教程": tutorial
-                        }
-        async with aiofiles.open("./config.json",
-                                mode="w",
-                                encoding="utf-8") as f:
-            await f.write(json.dumps(default_config,
-                                    indent=2,
-                                    ensure_ascii=False,
-                                    escape_forward_slashes=False))
-            await f.close()
-        log.info('🖱️ 程序可能为第一次启动，请填写配置文件后重新启动程序')
-    except Exception as e:
-        log.error(f'❗ 配置文件生成失败，{stack_error(e)}')
-
-
-async def load_config():
-    if not os.path.exists('./config.json'):
-        await gen_config_file()
-        os.system('pause')
-        sys.exit()
-    else:
-        try:
-            async with aiofiles.open("./config.json",
-                                     mode="r",
-                                     encoding="utf-8") as f:
-                config = json.loads(await f.read())
-                return config
-        except Exception as e:
-            log.error(f"配置文件加载失败，原因: {stack_error(e)}")
-            os.remove("./config.json")
-            os.system('pause')
-
-        
-config = asyncio.run(load_config())

common/dkey_merge.py

@@ -1,27 +0,0 @@
-import asyncio
-import aiofiles
-import vdf
-
-from .log import log
-
-lock = asyncio.Lock()
-
-
-async def depotkey_merge(config_path, depots_config):
-    if not config_path.exists():
-        async with lock:
-            log.error(' 👋 Steam默认配置不存在，可能是没有登录账号')
-        return
-    async with aiofiles.open(config_path, encoding='utf-8') as f:
-        content = await f.read()
-    config = vdf.loads(content)
-    software = config['InstallConfigStore']['Software']
-    valve = software.get('Valve') or software.get('valve')
-    steam = valve.get('Steam') or valve.get('steam')
-    if 'depots' not in steam:
-        steam['depots'] = {}
-    steam['depots'].update(depots_config['depots'])
-    async with aiofiles.open(config_path, mode='w', encoding='utf-8') as f:
-        new_content = vdf.dumps(config, pretty=True)
-        await f.write(new_content)
-    return True

common/get_manifest_info.py

@@ -1,34 +0,0 @@
-from pathlib import Path
-import aiofiles
-import vdf
-
-from .log import log
-from .manifest_down import get
-from .stack_error import stack_error
-
-
-async def get_manifest(sha, path, steam_path: Path, repo, session):
-    collected_depots = []
-    try:
-        if path.endswith('.manifest'):
-            depot_cache_path = steam_path / 'depotcache'
-            if not depot_cache_path.exists():
-                depot_cache_path.mkdir(exist_ok=True)
-            save_path = depot_cache_path / path
-            if save_path.exists():
-                log.warning(f'👋已存在清单: {path}')
-                return collected_depots
-            content = await get(sha, path, repo, session)
-            log.info(f' 🔄 清单下载成功: {path}')
-            async with aiofiles.open(save_path, 'wb') as f:
-                await f.write(content)
-        elif path == 'Key.vdf':
-            content = await get(sha, path, repo, session)
-            log.info(f' 🔄 密钥下载成功: {path}')
-            depots_config = vdf.loads(content.decode(encoding='utf-8'))
-            for depot_id, depot_info in depots_config['depots'].items():
-                collected_depots.append((depot_id, depot_info['DecryptionKey']))
-    except Exception as e:
-        log.error(f'处理失败: {path} - {stack_error(e)}')
-        raise
-    return collected_depots

common/get_steam_path.py

@@ -1,23 +0,0 @@
-import os
-
-import winreg
-
-from pathlib import Path
-from .log import log
-from .config import config
-from .stack_error import stack_error
-
-def get_steam_path():
-    try:
-        key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, r'Software\Valve\Steam')
-        steam_path = Path(winreg.QueryValueEx(key, 'SteamPath')[0])
-        custom_steam_path = config["Custom_Steam_Path"]
-        if not custom_steam_path == '':
-            return Path(custom_steam_path)
-        else:
-            return steam_path
-    except Exception as e:
-        log.error(f'Steam路径获取失败, {stack_error(e)}')
-        os.system('pause')
-    
-steam_path = get_steam_path()

common/gl_unlock.py

@@ -1,28 +0,0 @@
-from .get_steam_path import steam_path
-
-async def greenluma_add(depot_id_list):
-    app_list_path = steam_path / 'AppList'
-    if app_list_path.exists() and app_list_path.is_file():
-        app_list_path.unlink(missing_ok=True)
-    if not app_list_path.is_dir():
-        app_list_path.mkdir(parents=True, exist_ok=True)
-    depot_dict = {}
-    for i in app_list_path.iterdir():
-        if i.stem.isdecimal() and i.suffix == '.txt':
-            with i.open('r', encoding='utf-8') as f:
-                app_id_ = f.read().strip()
-                depot_dict[int(i.stem)] = None
-                if app_id_.isdecimal():
-                    depot_dict[int(i.stem)] = int(app_id_)
-    for depot_id in depot_id_list:
-        if int(depot_id) not in depot_dict.values():
-            index = max(depot_dict.keys()) + 1 if depot_dict.keys() else 0
-            if index != 0:
-                for i in range(max(depot_dict.keys())):
-                    if i not in depot_dict.keys():
-                        index = i
-                        break
-            with (app_list_path / f'{index}.txt').open('w', encoding='utf-8') as f:
-                f.write(str(depot_id))
-            depot_dict[index] = int(depot_id)
-    return True

common/init_text.py

@@ -1,19 +0,0 @@
-from colorama import Fore, Back, Style, init
-
-init()
-
-from .log import log
-
-def init():
-    print(f"{Fore.GREEN}{Back.BLACK}{Style.BRIGHT}  _____   __   _   _____   _   _    _____  __    __ {Style.RESET_ALL}")
-    print(f"{Fore.GREEN}{Back.BLACK}{Style.BRIGHT} /  _  \\ |  \\ | | | ____| | | / /  | ____| \\ \\  / /{Style.RESET_ALL}")
-    print(f"{Fore.GREEN}{Back.BLACK}{Style.BRIGHT} | | | | |   \\| | | |__   | |/ /   | |__    \\ \\/ /{Style.RESET_ALL}")
-    print(f"{Fore.GREEN}{Back.BLACK}{Style.BRIGHT} | | | | | |\\   | |  __|  | |\\ \\   |  __|    \\  / {Style.RESET_ALL}")
-    print(f"{Fore.GREEN}{Back.BLACK}{Style.BRIGHT} | |_| | | | \\  | | |___  | | \\ \\  | |___    / /{Style.RESET_ALL}")
-    print(f"{Fore.GREEN}{Back.BLACK}{Style.BRIGHT} \\_____/ |_|  \\_| |_____| |_|  \\_\\ |_____|  /_/{Style.RESET_ALL}")
-    log.info('作者：ikun0014')
-    log.info('本项目采用GNU General Public License v3开源许可证')
-    log.info('版本：1.2.3')
-    log.info('项目仓库：https://github.com/ikunshare/Onekey')
-    log.info('官网：ikunshare.com')
-    log.warning('本项目完全开源免费，如果你在淘宝，QQ群内通过购买方式获得，赶紧回去骂商家死全家\n交流群组：\nhttps://qm.qq.com/q/d7sWovfAGI\nhttps://t.me/ikunshare_group')

common/log.py

@@ -1,23 +1,51 @@
-import logging
-import colorlog
+try:
+    import os
+    import colorama
+    import logging
+    import logzero
+    from logzero import setup_logger, LogFormatter
+    from .variable import LOG_FILE, DEBUG_MODE
+except ImportError as e:
+    print(e)
+    import os
+
+    os.system("pause")
+
+if not os.path.exists(f"./logs"):
+    os.makedirs(f"./logs")
 
 
-def init_log():
-    logger = logging.getLogger('Onekey')
-    logger.setLevel(logging.DEBUG)
-    stream_handler = logging.StreamHandler()
-    stream_handler.setLevel(logging.DEBUG)
-    fmt_string = '%(log_color)s[%(name)s][%(levelname)s]%(message)s'
-    log_colors = {
-        'INFO': 'cyan',
-        'WARNING': 'yellow',
-        'ERROR': 'red',
-        'CRITICAL': 'purple'
+def log(name: str) -> logging.Logger:
+    if DEBUG_MODE:
+        level = logzero.DEBUG
+    else:
+        level = logzero.INFO
+
+    colors = {
+        logzero.DEBUG: colorama.Fore.CYAN,
+        logzero.INFO: colorama.Fore.GREEN,
+        logzero.WARNING: colorama.Fore.YELLOW,
+        logzero.ERROR: colorama.Fore.RED,
+        logzero.CRITICAL: colorama.Fore.MAGENTA,
     }
-    fmt = colorlog.ColoredFormatter(fmt_string, log_colors=log_colors)
-    stream_handler.setFormatter(fmt)
-    logger.addHandler(stream_handler)
+
+    terminal_formatter = LogFormatter(
+        color=True,
+        fmt="%(color)s%(message)s%(end_color)s",
+        datefmt="%Y-%m-%d %H:%M:%S",
+        colors=colors,
+    )
+
+    logger = setup_logger(name, level=level, formatter=terminal_formatter)
+
+    if LOG_FILE:
+        logfile = f"./logs/{name}.log"
+        file_handler = logging.FileHandler(logfile)
+        file_formatter = logging.Formatter(
+            "[%(asctime)s] | [%(name)s:%(levelname)s] | [%(module)s.%(funcName)s:%(lineno)d] - %(message)s",
+            datefmt="%Y-%m-%d %H:%M:%S",
+        )
+        file_handler.setFormatter(file_formatter)
+        logger.addHandler(file_handler)
+
     return logger
-
-
-log = init_log()

common/main_func.py

@@ -1,80 +0,0 @@
-import os
-
-from aiohttp import ClientSession
-
-from common.config import config
-from common.dkey_merge import depotkey_merge
-from common.migration import migrate
-from common.st_unlock import stool_add
-from common.gl_unlock import greenluma_add
-from common.get_manifest_info import get_manifest
-from common.check import check_github_api_rate_limit
-from common.log import log
-from common.get_steam_path import steam_path
-from common.stack_error import stack_error
-
-isGreenLuma = any((steam_path / dll).exists() for dll in ['GreenLuma_2024_x86.dll', 'GreenLuma_2024_x64.dll', 'User32.dll'])
-isSteamTools = (steam_path / 'config' / 'stUI').is_dir()
-
-async def main(app_id, repos):
-    app_id_list = list(filter(str.isdecimal, app_id.strip().split('-')))
-    if not app_id_list:
-        log.error(f'⚠  App ID无效')
-        return False
-    else:
-        app_id = app_id_list[0]
-    
-    async with ClientSession() as session:
-        github_token = config["Github_Personal_Token"]
-        headers = {'Authorization': f'Bearer {github_token}'} if github_token else None
-        latest_date = None
-        selected_repo = None
-        await check_github_api_rate_limit(headers, session)
-        for repo in repos:
-            url = f'https://api.github.com/repos/{repo}/branches/{app_id}'
-            try:
-                async with session.get(url, headers=headers, ssl=False) as r:
-                    r_json = await r.json()
-                    if 'commit' in r_json:
-                        date = r_json['commit']['commit']['author']['date']
-                        if latest_date is None or date > latest_date:
-                            latest_date = date
-                            selected_repo = repo
-            except Exception as e:
-                log.error(f'⚠ 获取分支信息失败: {stack_error(e)}')
-
-        if selected_repo:
-            log.info(f' 🔄 选择清单仓库：{selected_repo}')
-            url = f'https://api.github.com/repos/{selected_repo}/branches/{app_id}'
-            async with session.get(url, headers=headers, ssl=False) as r:
-                r_json = await r.json()
-                if 'commit' in r_json:
-                    sha = r_json['commit']['sha']
-                    url = r_json['commit']['commit']['tree']['url']
-                    async with session.get(url, headers=headers, ssl=False) as r2:
-                        r2_json = await r2.json()
-                        if 'tree' in r2_json:
-                            collected_depots = []
-                            for i in r2_json['tree']:
-                                result = await get_manifest(sha, i['path'], steam_path, selected_repo, session)
-                                collected_depots.extend(result)
-                            if collected_depots:
-                                if isSteamTools:
-                                    await migrate(st_use=True, session=session)
-                                    await stool_add(collected_depots, app_id)
-                                    log.info(' ✅ 找到SteamTools，已添加解锁文件')
-                                if isGreenLuma:
-                                    await migrate(st_use=False, session=session)
-                                    await greenluma_add([app_id])
-                                    depot_config = {'depots': {depot_id: {'DecryptionKey': depot_key} for depot_id, depot_key in collected_depots}}
-                                    await depotkey_merge(steam_path / 'config' / 'config.vdf', depot_config)
-                                    if await greenluma_add([int(i) for i in depot_config['depots'] if i.isdecimal()]):
-                                        log.info('✅ 找到GreenLuma，已添加解锁文件')
-                                log.info(f'✅ 清单最后更新时间：{date}')
-                                log.info(f'✅ 入库成功: {app_id}')
-                                os.system('pause')
-                                return True
-                            
-        log.error(f'⚠ 清单下载或生成失败: {app_id}')
-        os.system('pause')
-        return False

common/manifest_down.py

@@ -1,37 +0,0 @@
-from aiohttp import ClientError
-from tqdm.asyncio import tqdm_asyncio
-
-from .log import log
-
-
-async def get(sha, path, repo, session):
-    url_list = [
-        f'https://cdn.jsdmirror.com/gh/{repo}@{sha}/{path}',
-        f'https://jsd.onmicrosoft.cn/gh/{repo}@{sha}/{path}',
-        f'https://raw.dgithub.xyz/{repo}/{sha}/{path}',
-        f'https://raw.gitmirror.com/{repo}/{sha}/{path}',
-        f'https://raw.githubusercontent.com/{repo}/{sha}/{path}'
-    ]
-    retry = 3
-    while retry:
-        for url in url_list:
-            try:
-                async with session.get(url, ssl=False) as r:
-                    if r.status == 200:
-                        total_size = int(r.headers.get('Content-Length', 0))
-                        chunk_size = 2048
-                        content = bytearray()
-
-                        with tqdm_asyncio(total=total_size, unit='B', unit_scale=True, desc=f'下载 {path}', colour='#ffadad') as pbar:
-                            async for chunk in r.content.iter_chunked(chunk_size):
-                                content.extend(chunk)
-                                pbar.update(len(chunk))
-                        return content
-                    else:
-                        log.error(f'🔄 获取失败: {path} - 状态码: {r.status}')
-            except ClientError:
-                log.error(f'🔄 获取失败: {path} - 连接错误')
-        retry -= 1
-        log.warning(f'🔄 重试剩余次数: {retry} - {path}')
-    log.error(f'🔄 超过最大重试次数: {path}')
-    raise Exception(f'🔄 无法下载: {path}')

common/migration.py

@@ -1,54 +0,0 @@
-import os
-import subprocess
-import aiofiles
-from pathlib import Path
-from tqdm.asyncio import tqdm
-
-from .log import log
-from .get_steam_path import steam_path
-
-directory = Path(steam_path / "config" / "stplug-in")
-
-async def migrate(st_use, session):
-    if st_use == True:
-        log.info('🔄 检测到你正在使用SteamTools，尝试迁移旧文件')
-        if os.path.exists(directory):
-            for filename in os.listdir(directory):
-                if filename.startswith("Onekey_unlock_"):
-                    new_filename = filename[len("Onekey_unlock_"):]
-
-                    old_file = os.path.join(directory, filename)
-                    new_file = os.path.join(directory, new_filename)
-
-                    try:
-                        os.replace(old_file, new_file)
-                        log.info(f'Renamed: {filename} -> {new_filename}')
-                    except Exception as e:
-                        log.error(f'Failed to rename {filename} -> {new_filename}: {e}')
-        else:
-            log.error('⚠ 故障，正在重新安装SteamTools')
-            temp_path = './temp'
-            if not os.path.exists(temp_path):
-                os.mkdir(temp_path)
-            down_url = 'https://steamtools.net/res/SteamtoolsSetup.exe'
-            out_path = './temp/SteamtoolsSetup.exe'
-
-            async with session.get(down_url, stream=True) as r:
-                if r.status == 200:
-                    total_size = int(await  r.headers.get('Content-Length', 0))
-                    chunk_size = 8192
-                    progress = tqdm(total=total_size, unit='B', unit_scale=True)
-
-                    async with aiofiles.open(out_path, mode='wb') as f:
-                        async for chunk in r.content.iter_chunked(chunk_size=chunk_size):
-                            await f.write(chunk)
-                            await progress.update(len(chunk))
-
-                    await progress.close()
-                else:
-                    log.error('⚠ 网络错误')
-
-            subprocess.run(str(out_path))
-            os.rmdir(temp_path)
-    else:
-        log.info('✅ 未使用SteamTools，停止迁移')

common/st_unlock.py

@@ -1,25 +0,0 @@
-import os
-import asyncio
-import subprocess
-import aiofiles
-
-from .log import log
-from .get_steam_path import steam_path
-
-lock = asyncio.Lock()
-
-async def stool_add(depot_data, app_id):
-    lua_filename = f"{app_id}.lua"
-    lua_filepath = steam_path / "config" / "stplug-in" / lua_filename
-
-    async with lock:
-        log.info(f'✅ SteamTools解锁文件生成: {lua_filepath}')
-        async with aiofiles.open(lua_filepath, mode="w", encoding="utf-8") as lua_file:
-            await lua_file.write(f'addappid({app_id}, 1, "None")\n')
-            for depot_id, depot_key in depot_data:
-                await lua_file.write(f'addappid({depot_id}, 1, "{depot_key}")\n')
-
-    luapacka_path = steam_path / "config" / "stplug-in" / "luapacka.exe"
-    subprocess.run([str(luapacka_path), str(lua_filepath)])
-    os.remove(lua_filepath)
-    return True

common/stack_error.py

@@ -1,5 +0,0 @@
-import traceback
-
-def stack_error(exception):
-    stack_trace = traceback.format_exception(type(exception), exception, exception.__traceback__)
-    return ''.join(stack_trace)

common/variable.py

@@ -0,0 +1,79 @@
+try:
+    import time
+    import httpx
+    import sys
+    import winreg
+    import ujson as json
+    from pathlib import Path
+except ImportError as e:
+    print(e)
+    import os
+
+    os.system("pause")
+
+
+def get_steam_path(config: dict) -> Path:
+    """获取Steam安装路径"""
+    try:
+        if custom_path := config.get("Custom_Steam_Path"):
+            return Path(custom_path)
+
+        with winreg.OpenKey(winreg.HKEY_CURRENT_USER, r"Software\Valve\Steam") as key:
+            return Path(winreg.QueryValueEx(key, "SteamPath")[0])
+    except Exception as e:
+        print(f"Steam路径获取失败: {str(e)}")
+        sys.exit(1)
+
+
+DEFAULT_CONFIG = {
+    "Github_Personal_Token": "",
+    "Custom_Steam_Path": "",
+    "Debug_Mode": False,
+    "Logging_Files": True,
+    "Help": "Github Personal Token可在GitHub设置的Developer settings中生成",
+}
+
+
+def generate_config() -> None:
+    try:
+        with open(Path("./config.json"), "w", encoding="utf-8") as f:
+            f.write(json.dumps(DEFAULT_CONFIG, indent=2, ensure_ascii=False))
+        print("配置文件已生成")
+    except IOError as e:
+        print(f"配置文件创建失败: {str(e)}")
+        sys.exit(1)
+
+
+def load_config() -> dict:
+    if not Path("./config.json").exists():
+        generate_config()
+        print("请填写配置文件后重新运行程序，5秒后退出")
+        time.sleep(5)
+        sys.exit(1)
+
+    try:
+        with open(Path("./config.json"), "r", encoding="utf-8") as f:
+            return json.loads(f.read())
+    except json.JSONDecodeError:
+        print("配置文件损坏，正在重新生成...")
+        generate_config()
+        sys.exit(1)
+    except Exception as e:
+        print(f"配置加载失败: {str(e)}")
+        sys.exit(1)
+
+
+CLIENT = httpx.AsyncClient(verify=False)
+CONFIG = load_config()
+DEBUG_MODE = CONFIG.get("Debug_Mode", False)
+LOG_FILE = CONFIG.get("Logging_Files", True)
+GITHUB_TOKEN = str(CONFIG.get("Github_Personal_Token", ""))
+STEAM_PATH = get_steam_path(CONFIG)
+IS_CN = True
+HEADER = {"Authorization": f"Bearer {GITHUB_TOKEN}"} if GITHUB_TOKEN else None
+REPO_LIST = [
+    "SteamAutoCracks/ManifestHub",
+    "ikun0014/ManifestHub",
+    "Auiowu/ManifestAutoUpdate",
+    "tymolu233/ManifestAutoUpdate-fix",
+]

main.py

@@ -1,34 +1,350 @@
-import os
-import time
-import asyncio
+try:
+    import os
+    import sys
 
-from colorama import Fore, Back, Style
-from colorama import init as cinit
-from common.log import log
-from common.stack_error import stack_error
-from common.init_text import init
-from common.main_func import main
+    sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
-lock = asyncio.Lock()
+    import vdf
+    import time
+    import httpx
+    import asyncio
+    import traceback
+    from typing import Any, Tuple, List, Dict
+    from pathlib import Path
+    from common import log, variable
+    from common.variable import (
+        CLIENT,
+        HEADER,
+        STEAM_PATH,
+        REPO_LIST,
+    )
+except ImportError as e:
+    import os
 
-init()
-cinit()
+    print(e)
+    os.system("pause")
 
-repos = [
-         'ikun0014/ManifestHub',
-         'Auiowu/ManifestAutoUpdate',
-         'tymolu233/ManifestAutoUpdate',
-        ]
 
-if __name__ == '__main__':
+LOCK = asyncio.Lock()
+LOG = log.log("Onekey")
+DEFAULT_REPO = REPO_LIST[0]
+
+
+def init() -> None:
+    """初始化控制台输出"""
+    banner = r"""
+    _____   __   _   _____   _   _    _____  __    __ 
+   /  _  \ |  \ | | | ____| | | / /  | ____| \ \  / /
+   | | | | |   \| | | |__   | |/ /   | |__    \ \/ / 
+   | | | | | |\   | |  __|  | |\ \   |  __|    \  /  
+   | |_| | | | \  | | |___  | | \ \  | |___    / /   
+   \_____/ |_|  \_| |_____| |_|  \_\ |_____|  /_/    
+    """
+    LOG.info(banner)
+    LOG.info("作者: ikun0014 | 版本: 1.4.9 | 官网: ikunshare.top")
+    LOG.info("项目仓库: GitHub: https://github.com/ikunshare/Onekey")
+    LOG.warning("ikunshare.top | 严禁倒卖")
+    LOG.warning("提示: 请确保已安装Windows 10/11并正确配置Steam;SteamTools/GreenLuma")
+    LOG.warning("开梯子必须配置Token, 你的IP我不相信能干净到哪")
+
+
+async def CheckCN() -> bool:
     try:
-        log.info('❗ App ID可以在SteamDB或Steam商店链接页面查看')
-        while True:
-            app_id = input(f"{Fore.CYAN}{Back.BLACK}{Style.BRIGHT}🤔 请输入游戏AppID：{Style.RESET_ALL}").strip()
-            asyncio.run(main(app_id, repos))
+        req = await CLIENT.get("https://mips.kugou.com/check/iscn?&format=json")
+        body = req.json()
+        scn = bool(body["flag"])
+        if not scn:
+            LOG.info(
+                f"您在非中国大陆地区({body['country']})上使用了项目, 已自动切换回Github官方下载CDN"
+            )
+            variable.IS_CN = False
+            return False
+        else:
+            variable.IS_CN = True
+            return True
     except KeyboardInterrupt:
-        exit()
+        LOG.info("程序已退出")
+        return True
+    except httpx.ConnectError as e:
+        variable.IS_CN = True
+        LOG.warning("检查服务器位置失败，已忽略，自动认为你在中国大陆")
+        return False
+
+
+def StackError(exception: Exception) -> str:
+    stack_trace = traceback.format_exception(
+        type(exception), exception, exception.__traceback__
+    )
+    return "".join(stack_trace)
+
+
+async def CheckLimit(headers):
+    url = "https://api.github.com/rate_limit"
+    try:
+        r = await CLIENT.get(url, headers=headers)
+        r_json = r.json()
+        if r.status_code == 200:
+            rate_limit = r_json.get("rate", {})
+            remaining_requests = rate_limit.get("remaining", 0)
+            reset_time = rate_limit.get("reset", 0)
+            reset_time_formatted = time.strftime(
+                "%Y-%m-%d %H:%M:%S", time.localtime(reset_time)
+            )
+            LOG.info(f"剩余Github API请求次数: {remaining_requests}")
+            if remaining_requests == 0:
+                LOG.warning(
+                    f"GitHub API 请求数已用尽, 将在 {reset_time_formatted} 重置, 建议生成一个填在配置文件里"
+                )
+        else:
+            LOG.error("Github请求数检查失败, 网络错误")
+    except KeyboardInterrupt:
+        LOG.info("程序已退出")
+    except httpx.ConnectError as e:
+        LOG.error(f"检查Github API 请求数失败, {StackError(e)}")
+    except httpx.ConnectTimeout as e:
+        LOG.error(f"检查Github API 请求数超时: {StackError(e)}")
     except Exception as e:
-        log.error(f' ⚠ 发生错误: {stack_error(e)}，将在5秒后退出')
-        time.sleep(5)
-        os.system('pause')
+        LOG.error(f"发生错误: {StackError(e)}")
+
+
+async def GetLatestRepoInfo(repos: list, app_id: str, headers) -> Any | str | None:
+    latest_date = None
+    selected_repo = None
+    for repo in repos:
+        url = f"https://api.github.com/repos/{repo}/branches/{app_id}"
+        r = await CLIENT.get(url, headers=headers)
+        r_json = r.json()
+        if r_json and "commit" in r_json:
+            date = r_json["commit"]["commit"]["author"]["date"]
+            if (latest_date is None) or (date > latest_date):
+                latest_date = str(date)
+                selected_repo = str(repo)
+    return selected_repo, latest_date
+
+
+async def HandleDepotFiles(
+    repos: List, app_id: str, steam_path: Path
+) -> List[Tuple[str, str]]:
+    collected = []
+    depot_map = {}
+    try:
+        selected_repo, latest_date = await GetLatestRepoInfo(
+            repos, app_id, headers=HEADER
+        )  # type: ignore
+
+        if selected_repo:
+            branch_url = (
+                f"https://api.github.com/repos/{selected_repo}/branches/{app_id}"
+            )
+            branch_res = await CLIENT.get(branch_url, headers=HEADER)
+            branch_res.raise_for_status()
+
+            tree_url = branch_res.json()["commit"]["commit"]["tree"]["url"]
+            tree_res = await CLIENT.get(tree_url)
+            tree_res.raise_for_status()
+
+            depot_cache = Path(f"{steam_path}/depotcache")
+            depot_cache.mkdir(exist_ok=True)
+
+            LOG.info(f"当前选择清单仓库: https://github.com/{selected_repo}")
+            LOG.info(f"此清单分支上次更新时间：{latest_date}")
+
+            for item in tree_res.json()["tree"]:
+                file_path = str(item["path"])
+                if file_path.endswith(".manifest"):
+                    save_path = depot_cache / file_path
+                    if save_path.exists():
+                        LOG.warning(f"已存在清单: {save_path}")
+                        continue
+                    content = await FetchFiles(
+                        branch_res.json()["commit"]["sha"], file_path, selected_repo
+                    )
+                    LOG.info(f"清单下载成功: {file_path}")
+                    with open(save_path, "wb") as f:
+                        f.write(content)
+                elif "key.vdf" in file_path.lower():
+                    key_content = await FetchFiles(
+                        branch_res.json()["commit"]["sha"], file_path, selected_repo
+                    )
+                    collected.extend(ParseKey(key_content))
+
+            for item in tree_res.json()["tree"]:
+                if not item["path"].endswith(".manifest"):
+                    continue
+
+                filename = Path(item["path"]).stem
+                if "_" not in filename:
+                    continue
+
+                depot_id, manifest_id = filename.replace(".manifest", "").split("_", 1)
+                if not (depot_id.isdigit() and manifest_id.isdigit()):
+                    continue
+
+                depot_map.setdefault(depot_id, []).append(manifest_id)
+
+            for depot_id in depot_map:
+                depot_map[depot_id].sort(key=lambda x: int(x), reverse=True)
+
+    except httpx.HTTPStatusError as e:
+        LOG.error(f"HTTP错误: {e.response.status_code}")
+    except Exception as e:
+        LOG.error(f"文件处理失败: {str(e)}")
+    return collected, depot_map  # type: ignore
+
+
+async def FetchFiles(sha: str, path: str, repo: str):
+    if variable.IS_CN:
+        url_list = [
+            f"https://cdn.jsdmirror.com/gh/{repo}@{sha}/{path}",
+            f"https://raw.gitmirror.com/{repo}/{sha}/{path}",
+            f"https://raw.dgithub.xyz/{repo}/{sha}/{path}",
+            f"https://gh.akass.cn/{repo}/{sha}/{path}",
+        ]
+    else:
+        url_list = [f"https://raw.githubusercontent.com/{repo}/{sha}/{path}"]
+    retry = 3
+    while retry > 0:
+        for url in url_list:
+            try:
+                r = await CLIENT.get(url, headers=HEADER, timeout=30)
+                if r.status_code == 200:
+                    return r.read()
+                else:
+                    LOG.error(f"获取失败: {path} - 状态码: {r.status_code}")
+            except KeyboardInterrupt:
+                LOG.info("程序已退出")
+            except httpx.ConnectError as e:
+                LOG.error(f"获取失败: {path} - 连接错误: {str(e)}")
+            except httpx.ConnectTimeout as e:
+                LOG.error(f"连接超时: {url} - 错误: {str(e)}")
+
+        retry -= 1
+        LOG.warning(f"重试剩余次数: {retry} - {path}")
+
+    LOG.error(f"超过最大重试次数: {path}")
+
+    raise Exception(f"无法下载: {path}")
+
+
+def ParseKey(content: bytes) -> List[Tuple[str, str]]:
+    try:
+        depots = vdf.loads(content.decode("utf-8"))["depots"]
+        return [(d_id, d_info["DecryptionKey"]) for d_id, d_info in depots.items()]
+    except Exception as e:
+        LOG.error(f"密钥解析失败: {str(e)}")
+        return []
+
+
+def SetupUnlock(
+    depot_data: List[Tuple[str, str]],
+    app_id: str,
+    tool_choice: int,
+    depot_map: Dict,
+) -> bool:
+
+    if tool_choice == 1:
+        return SetupTools(depot_data, app_id, depot_map)
+    elif tool_choice == 2:
+        return SetupGreenLuma(depot_data)
+    else:
+        LOG.error("你选的啥？")
+        return False
+
+
+def SetupTools(depot_data: List[Tuple[str, str]], app_id: str, depot_map: Dict) -> bool:
+    st_path = Path(f"{STEAM_PATH}/config/stplug-in")
+    st_path.mkdir(exist_ok=True)
+
+    choice = input(
+        f"是否锁定版本(推荐在选择仓库SteamAutoCracks/ManifestHub时使用)?(y/n): "
+    ).lower()
+
+    if choice == "y":
+        versionlock = True
+    else:
+        versionlock = False
+
+    lua_content = f'addappid({app_id}, 1, "None")\n'
+    for d_id, d_key in depot_data:
+        if versionlock:
+            for manifest_id in depot_map[d_id]:
+                lua_content += f'addappid({d_id}, 1, "{d_key}")\nsetManifestid({d_id},"{manifest_id}")\n'
+        else:
+            lua_content += f'addappid({d_id}, 1, "{d_key}")\n'
+
+    lua_file = st_path / f"{app_id}.lua"
+    with open(lua_file, "w") as f:
+        f.write(lua_content)
+
+    return True
+
+
+def SetupGreenLuma(depot_data: List[Tuple[str, str]]) -> bool:
+    applist_dir = Path(f"{STEAM_PATH}/AppList")
+    applist_dir.mkdir(exist_ok=True)
+
+    for f in applist_dir.glob("*.txt"):
+        f.unlink()
+
+    for idx, (d_id, _) in enumerate(depot_data, 1):
+        (applist_dir / f"{idx}.txt").write_text(str(d_id))
+
+    config_path = Path(f"{STEAM_PATH}/config/config.vdf")
+    with open(config_path, "r+") as f:
+        content = vdf.loads(f.read())
+        content.setdefault("depots", {}).update(
+            {d_id: {"DecryptionKey": d_key} for d_id, d_key in depot_data}
+        )
+        f.seek(0)
+        f.write(vdf.dumps(content))
+    return True
+
+
+async def Main(app_id: str):
+    app_id_list = list(filter(str.isdecimal, app_id.strip().split("-")))
+    if not app_id_list:
+        LOG.error(f"App ID无效")
+        os.system("pause")
+        return False
+
+    app_id = app_id_list[0]
+
+    try:
+        await CheckCN()
+        await CheckLimit(HEADER)
+
+        depot_data, depot_map = await HandleDepotFiles(REPO_LIST, app_id, STEAM_PATH)
+
+        if (not depot_data) or (not depot_map):
+            LOG.error(f"未找到此游戏的清单")
+            return os.system("pause")
+
+        tool_choice = int(input("请选择解锁工具 (1.SteamTools 2.GreenLuma): "))
+
+        if SetupUnlock(depot_data, app_id, tool_choice, depot_map):  # type: ignore
+            LOG.info("游戏解锁配置成功！")
+            LOG.info("重启Steam后生效")
+        else:
+            LOG.error("配置失败")
+
+        os.system("pause")
+        return True
+    except Exception as e:
+        LOG.error(f"运行错误: {StackError(e)}")
+        return os.system("pause")
+    except KeyboardInterrupt:
+        return os.system("pause")
+    finally:
+        await CLIENT.aclose()
+
+
+if __name__ == "__main__":
+    try:
+        init()
+        app_id = input(f"请输入游戏AppID: ").strip()
+        asyncio.run(Main(app_id))
+    except (asyncio.CancelledError, KeyboardInterrupt):
+        os.system("pause")
+    except Exception as e:
+        LOG.error(f"错误：{StackError(e)}")
+        os.system("pause")

package.json

@@ -1,6 +1,6 @@
 {
   "name": "onekey",
-  "version": "1.2.3",
+  "version": "1.4.9",
   "description": "一个Steam仓库清单下载器",
   "main": "index.js",
   "scripts": {

requirements.txt

@@ -1,8 +1,4 @@
-aiofiles
-colorlog
+httpx
+logzero
 ujson
-vdf
-requests
-imageio
-aiohttp
-tqdm
+Pillow