build: ci

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/workflows/ci.yml

@@ -0,0 +1,66 @@
+name: Build CI
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    permissions:
+      contents: write
+    runs-on: windows-2019
+    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: 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 imageio
+        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: 0.0.0.0
+        product-version: 0.0.0.0
+        file-description: Onekey_Beta_${{ github.sha }}
+        copyright: Copyright © 2024 ikun0014
+        output-file: Onekey_${{ github.sha }}.exe
+        assume-yes-for-downloads: true
+        output-dir: build
+
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: Onekey_${{ github.sha }}.exe
+        path: build/Onekey_${{ github.sha }}.exe
+
+    - name: Upload to Telegram Channel
+      run: |
+        & curl -F "chat_id=${{ secrets.TELEGRAM_TO }}" `
+            -F "document=@build/Onekey_${{ github.sha }}.exe" `
+            -F "caption=Onekey's New CI Build ${{ github.sha }}" `
+            -F "parse_mode=Markdown" `
+            "https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendDocument"

.github/workflows/release.yml

@@ -7,19 +7,20 @@ on:
 
 jobs:
   build:
+    if: contains(github.event.head_commit.message, '[release]')
+    permissions:
+      contents: write
     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:
@@ -28,6 +29,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
+        pip install imageio
         pip install -r requirements.txt
 
     - name: Build
@@ -62,10 +64,17 @@ jobs:
     - name: Release
       uses: softprops/action-gh-release@v2
       with:
+        tag_name: v${{ env.PACKAGE_VERSION }}
+        files: build/Onekey---v${{ env.PACKAGE_VERSION }}.exe
         prerelease: false
         draft: false
-        tag_name: v${{ env.PACKAGE_VERSION }}
-        files: |
-          build/Onekey---v${{ env.PACKAGE_VERSION }}.exe
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Upload to Telegram Channel
+      run: |
+        & curl -F "chat_id=${{ secrets.TELEGRAM_TO }}" `
+            -F "document=@build/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"

.gitignore

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

README.md

@@ -59,3 +59,12 @@ pip install -r requirements.txt
  <a href="https://github.com/ikunshare/Onekey/graphs/contributors">
    <img src="https://contrib.rocks/image?repo=ikunshare/Onekey" />
  </a>
+
+## 常见问题解答（FAQ）
+查看 [FAQ](https://ikunshare.com/d/49) 获取常见问题的解答。
+
+## 社区和支持
+加入我们的社区，参与讨论和支持：
+- [GitHub Discussions](https://github.com/ikunshare/Onekey/discussions)
+- [QQ](https://qm.qq.com/q/d7sWovfAGI)
+- [Telegram](https://t.me/ikunshare_qun)

common/check.py

@@ -1,26 +1,33 @@
-import os
 import time
-
+from aiohttp import ClientError, ConnectionTimeoutError
 from .log import log
+from .stack_error import stack_error
 
 async def check_github_api_rate_limit(headers, session):
     url = 'https://api.github.com/rate_limit'
-
-    async with session.get(url, headers=headers, ssl=False) as r:
-        if not r == None:
+    
+    try:
+        async with session.get(url, headers=headers, ssl=False) as r:
             r_json = await r.json()
-        else:
-            log.error('孩子，你怎么做到的？')
-            os.system('pause')
 
-    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 r.status == 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'剩余请求次数: {remaining_requests}')
 
-    if remaining_requests == 0:
-        log.warning(f' ⚠ GitHub API 请求数已用尽，将在 {reset_time_formatted} 重置, 不想等生成一个填配置文件里')
+                if remaining_requests == 0:
+                    log.warning(f'GitHub API 请求数已用尽, 将在 {reset_time_formatted} 重置,建议生成一个填在配置文件里')
+            else:
+                log.error('Github请求数检查失败, 网络错误')
+    
+    except KeyboardInterrupt:
+        log.info("\n 程序已退出")
+    except ClientError as e:
+        log.error(f'检查Github API 请求数失败,{stack_error(e)}')
+    except ConnectionTimeoutError as e:
+        log.error(f'检查Github API 请求数超时: {stack_error(e)}')
+    except Exception as e:
+        log.error(f'发生错误: {stack_error(e)}')

common/checkcn.py

@@ -0,0 +1,26 @@
+import os
+import requests
+from .log import log
+from .stack_error import stack_error
+
+def checkcn():
+    try:
+        req = requests.get('https://mips.kugou.com/check/iscn?&format=json')
+        req.raise_for_status()
+        body = req.json()
+        scn = bool(body['flag'])
+        if not scn:
+            log.info(f"您在非中国大陆地区({body['country']})上使用了项目, 已自动切换回Github官方下载CDN")
+            os.environ['IS_CN'] = 'no'
+            return False
+        else:
+            os.environ['IS_CN'] = 'yes'
+            return True
+            
+    except KeyboardInterrupt:
+        log.info("\n 程序已退出")
+    except requests.RequestException as e:
+        os.environ['IS_CN'] = 'yes'
+        log.warning('检查服务器位置失败，已忽略，自动认为你在中国大陆')
+        log.warning(stack_error(e))
+        return False

common/config.py

@@ -3,47 +3,44 @@ import sys
 import asyncio
 import ujson as json
 import aiofiles
-
 from .stack_error import stack_error
 from .log import log
 
+DEFAULT_CONFIG = {
+    "Github_Personal_Token": "",
+    "Custom_Steam_Path": "",
+    "QA1": "温馨提示：Github_Personal_Token可在Github设置的最底下开发者选项找到，详情看教程",
+    "教程": "https://ikunshare.com/Onekey_tutorial"
+}
 
 async def gen_config_file():
-    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(' 🖱️ 程序可能为第一次启动，请填写配置文件后重新启动程序')
-
+    try:
+        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))
+        
+        log.info('🖱️ 程序可能为第一次启动或配置重置,请填写配置文件后重新启动程序')
+    except KeyboardInterrupt:
+        log.info("\n 程序已退出")
+    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')
 
-        
+    try:
+        async with aiofiles.open("./config.json", mode="r", encoding="utf-8") as f:
+            config = json.loads(await f.read())
+            return config
+    except KeyboardInterrupt:
+        log.info("\n 程序已退出")
+    except Exception as e:
+        log.error(f"配置文件加载失败，原因: {stack_error(e)},重置配置文件中...")
+        os.remove("./config.json")
+        await gen_config_file()
+        os.system('pause')
+        sys.exit()
+
 config = asyncio.run(load_config())

common/dkey_merge.py

@@ -1,27 +1,42 @@
 import asyncio
 import aiofiles
 import vdf
-
+from pathlib import Path
 from .log import log
 
 lock = asyncio.Lock()
 
-
-async def depotkey_merge(config_path, depots_config):
+async def depotkey_merge(config_path: Path, depots_config: dict) -> bool:
     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
+            log.error('Steam默认配置不存在, 可能是没有登录账号')
+        return False
+
+    try:
+        async with aiofiles.open(config_path, encoding='utf-8') as f:
+            content = await f.read()
+        
+        config = vdf.loads(content)
+        steam = config.get('InstallConfigStore', {}).get('Software', {}).get('Valve') or \
+                config.get('InstallConfigStore', {}).get('Software', {}).get('valve')
+
+        if steam is None:
+            log.error('找不到Steam配置, 请检查配置文件')
+            return False
+        
+        depots = steam.setdefault('depots', {})
+        depots.update(depots_config.get('depots', {}))
+        
+        async with aiofiles.open(config_path, mode='w', encoding='utf-8') as f:
+            new_context = vdf.dumps(config, pretty=True)
+            await f.write(new_context)
+
+        log.info('成功合并')
+        return True
+        
+    except KeyboardInterrupt:
+        log.info("\n 程序已退出")
+    except Exception as e:
+        async with lock:
+            log.error(f'合并失败, 原因: {e}')
+        return False

common/get_manifest_info.py

@@ -6,29 +6,40 @@ 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):
+
+async def get_manifest(sha: str, path: str, steam_path: Path, repo: str, session) -> list:
     collected_depots = []
+    depot_cache_path = steam_path / 'depotcache'
+    
     try:
+        depot_cache_path.mkdir(exist_ok=True)
+
         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}')
+                log.warning(f'已存在清单: {save_path}')
                 return collected_depots
+
             content = await get(sha, path, repo, session)
-            log.info(f' 🔄 清单下载成功: {path}')
+            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']))
+            log.info(f'密钥下载成功: {path}')
+
+            depots_config = vdf.loads(content.decode('utf-8'))
+            collected_depots = [
+                (depot_id, depot_info['DecryptionKey'])
+                for depot_id, depot_info in depots_config['depots'].items()
+            ]
+
+    except KeyboardInterrupt:
+        log.info("\n 程序已退出")
     except Exception as e:
         log.error(f'处理失败: {path} - {stack_error(e)}')
         raise
-    return collected_depots
+
+    return collected_depots

common/get_steam_path.py

@@ -1,23 +1,22 @@
 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():
+def get_steam_path() -> 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
+        
+        custom_steam_path = config.get("Custom_Steam_Path", "").strip()
+        return Path(custom_steam_path) if custom_steam_path else steam_path
+    except KeyboardInterrupt:
+        log.info("\n 程序已退出")
     except Exception as e:
-        log.error(f'Steam路径获取失败, {stack_error(e)}')
+        log.error(f'Steam路径获取失败, {stack_error(e)}, 请检查是否正确安装Steam')
         os.system('pause')
-    
-steam_path = get_steam_path()
+        return Path()
+
+steam_path = get_steam_path()

common/gl_unlock.py

@@ -1,28 +1,32 @@
 from .get_steam_path import steam_path
+from pathlib import Path
 
-async def greenluma_add(depot_id_list):
+async def greenluma_add(depot_id_list: list) -> bool:
     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():
+
+    try:
         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
+
+        for file in app_list_path.glob('*.txt'):
+            file.unlink(missing_ok=True)
+
+        depot_dict = {
+            int(i.stem): int(i.read_text(encoding='utf-8').strip())
+            for i in app_list_path.iterdir() if i.is_file() and i.stem.isdecimal() and i.suffix == '.txt'
+        }
+
+        for depot_id in map(int, depot_id_list):
+            if depot_id not in depot_dict.values():
+                index = max(depot_dict.keys(), default=-1) + 1
+                while index in depot_dict:
+                    index += 1
+
+                (app_list_path / f'{index}.txt').write_text(str(depot_id), encoding='utf-8')
+
+                depot_dict[index] = depot_id
+
+        return True
+
+    except Exception as e:
+        print(f'处理时出错: {e}')
+        return False

common/init_text.py

@@ -1,15 +1,24 @@
+from colorama import Fore, Back, Style, init
+
+init()
+
 from .log import log
 
 def init():
-    print('\033[1;32;40m  _____   __   _   _____   _   _    _____  __    __ ' + '\033[0m')
-    print('\033[1;32;40m /  _  \\ |  \\ | | | ____| | | / /  | ____| \\ \\  / /' + '\033[0m')
-    print('\033[1;32;40m | | | | |   \\| | | |__   | |/ /   | |__    \\ \\/ /' + '\033[0m')
-    print('\033[1;32;40m | | | | | |\\   | |  __|  | |\\ \\   |  __|    \\  / ' + '\033[0m')
-    print('\033[1;32;40m | |_| | | | \\  | | |___  | | \\ \\  | |___    / /' + '\033[0m')
-    print('\033[1;32;40m \\_____/ |_|  \\_| |_____| |_|  \\_\\ |_____|  /_/' + '\033[0m')
-    log.info('作者ikun0014')
-    log.info('本项目基于wxy1343/ManifestAutoUpdate进行修改，采用GPL-3.0许可证')
-    log.info('版本：1.2.1')
-    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')
+    banner_lines = [
+        f"  _____   __   _   _____   _   _    _____  __    __ ",
+        f" /  _  \\ |  \\ | | | ____| | | / /  | ____| \\ \\  / /",
+        f" | | | | |   \\| | | |__   | |/ /   | |__    \\ \\/ /",
+        f" | | | | | |\\   | |  __|  | |\\ \\   |  __|    \\  / ",
+        f" | |_| | | | \\  | | |___  | | \\ \\  | |___    / /",
+        f" \\_____/ |_|  \\_| |_____| |_|  \\_\\ |_____|  /_/",
+    ]
+    for line in banner_lines:
+        log.info(line)
+    
+    log.info(f'作者: ikun0014')
+    log.warning(f'本项目采用GNU General Public License v3开源许可证，请勿用于商业用途')
+    log.info(f'版本: 1.3.0')
+    log.info(f'项目Github仓库: https://github.com/ikunshare/Onekey')
+    log.info(f'官网: ikunshare.com')
+    log.warning(f'本项目完全开源免费, 如果你在淘宝, QQ群内通过购买方式获得, 赶紧回去骂商家死全家\n   交流群组:\n    https://t.me/ikunshare_qun')

common/log.py

@@ -1,22 +1,28 @@
 import logging
 import colorlog
 
+LOG_FORMAT = '%(log_color)s%(message)s'
+LOG_COLORS = {
+    'INFO': 'cyan',
+    'WARNING': 'yellow',
+    'ERROR': 'red',
+    'CRITICAL': 'purple',
+}
 
-def init_log():
+def init_log(level=logging.DEBUG) -> logging.Logger:
     logger = logging.getLogger('Onekey')
-    logger.setLevel(logging.DEBUG)
+    logger.setLevel(level)
+
     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'
-    }
-    fmt = colorlog.ColoredFormatter(fmt_string, log_colors=log_colors)
+    stream_handler.setLevel(level)
+
+    fmt = colorlog.ColoredFormatter(LOG_FORMAT, log_colors=LOG_COLORS)
     stream_handler.setFormatter(fmt)
-    logger.addHandler(stream_handler)
+
+    # 避免重复添加处理器
+    if not logger.handlers:
+        logger.addHandler(stream_handler)
+
     return logger
 
 

common/main_func.py

@@ -1,7 +1,7 @@
 import os
+from aiohttp import ClientSession, ConnectionTimeoutError
 
-from aiohttp import ClientSession
-
+from common.checkcn import checkcn
 from common.config import config
 from common.dkey_merge import depotkey_merge
 from common.migration import migrate
@@ -16,61 +16,85 @@ 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):
+async def fetch_branch_info(session, url, headers):
+    try:
+        async with session.get(url, headers=headers, ssl=False) as response:
+            return await response.json()
+    except KeyboardInterrupt:
+        log.info("\n 程序已退出")
+    except Exception as e:
+        log.error(f'获取信息失败: {stack_error(e)}')
+        return None
+    except ConnectionTimeoutError as e:
+        log.error(f'获取信息时超时: {stack_error(e)}')
+        return None
+
+async def get_latest_repo_info(session, repos, app_id, headers):
+    latest_date = None
+    selected_repo = None
+
+    for repo in repos:
+        url = f'https://api.github.com/repos/{repo}/branches/{app_id}'
+        r_json = await fetch_branch_info(session, url, headers)
+        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 = date
+                selected_repo = repo
+
+    return selected_repo, latest_date
+
+async def main(app_id: str, repos: list) -> bool:
     app_id_list = list(filter(str.isdecimal, app_id.strip().split('-')))
+    if not app_id_list:
+        log.error(f'App ID无效')
+        return False
     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
+    checkcn()
 
+    async with ClientSession() as session:
+        github_token = config.get("Github_Personal_Token", "")
+        headers = {'Authorization': f'Bearer {github_token}'} if github_token else 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)}')
+        selected_repo, latest_date = await get_latest_repo_info(session, repos, app_id, headers)
+
         if selected_repo:
-            log.info(f' 🔄 选择清单仓库：{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:
-                                    migrate(st_use=True)
-                                    await stool_add(collected_depots, app_id)
-                                    log.info(' ✅ 找到SteamTools，已添加解锁文件')
-                                if isGreenLuma:
-                                    migrate(st_use=False)
-                                    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}')
+            r_json = await fetch_branch_info(session, url, headers)
+
+            if r_json and 'commit' in r_json:
+                sha = r_json['commit']['sha']
+                url = r_json['commit']['commit']['tree']['url']
+                r2_json = await fetch_branch_info(session, url, headers)
+                
+                if r2_json and 'tree' in r2_json:
+                    collected_depots = []
+                    for item in r2_json['tree']:
+                        result = await get_manifest(sha, item['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'清单最后更新时间:{latest_date}')
+                        log.info(f'入库成功: {app_id}')
+                        os.system('pause')
+                        return True
+            
+        log.error(f'清单下载或生成失败: {app_id}')
         os.system('pause')
-        return False
+        return False

common/manifest_down.py

@@ -1,37 +1,48 @@
-from aiohttp import ClientError
+import os
+from aiohttp import ClientError, ConnectionTimeoutError
 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://mirror.ghproxy.com/https://raw.githubusercontent.com/{repo}/{sha}/{path}',
-        f'https://raw.githubusercontent.com/{repo}/{sha}/{path}',
-    ]
+async def get(sha: str, path: str, repo: str, session, chunk_size: int = 1024) -> bytearray:
+    if os.environ.get('IS_CN') == 'yes':
+        url_list = [
+            f'https://jsdelivr.pai233.top/gh/{repo}@{sha}/{path}',
+            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:
+    while retry > 0:
         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 = 1024
+                async with session.get(url, ssl=False) as response:
+                    if response.status == 200:
+                        total_size = int(response.headers.get('Content-Length', 0))
                         content = bytearray()
 
-                        with tqdm_asyncio(total=total_size, unit='B', unit_scale=True, desc=f'下载 {path}') as pbar:
-                            async for chunk in r.content.iter_chunked(chunk_size):
+                        with tqdm_asyncio(total=total_size, unit='B', unit_scale=True, desc=f'下载 {path}', colour='#ffadad') as pbar:
+                            async for chunk in response.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} - 连接错误')
+                        log.error(f'获取失败: {path} - 状态码: {response.status}')
+            except KeyboardInterrupt:
+                log.info("\n 程序已退出")
+            except ClientError as e:
+                log.error(f'获取失败: {path} - 连接错误: {str(e)}')
+            except ConnectionTimeoutError as e:
+                log.error(f'连接超时: {url} - 错误: {str(e)}')
+        
         retry -= 1
-        log.warning(f' 🔄 重试剩余次数: {retry} - {path}')
-    log.error(f' 🔄 超过最大重试次数: {path}')
-    raise Exception(f' 🔄 无法下载: {path}')
+        log.warning(f'重试剩余次数: {retry} - {path}')
+    
+    log.error(f'超过最大重试次数: {path}')
+    raise Exception(f'无法下载: {path}')

common/migration.py

@@ -1,44 +1,64 @@
-import os
 import subprocess
-import requests
-
+import aiofiles
+from aiohttp import ConnectionTimeoutError
 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")
+directory = Path(steam_path) / "config" / "stplug-in"
+temp_path = Path('./temp')
+setup_url = 'https://steamtools.net/res/SteamtoolsSetup.exe'
+setup_file = temp_path / 'SteamtoolsSetup.exe'
 
-def migrate(st_use):
-    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)
+async def download_setup_file(session) -> None:
+    log.info('开始下载 SteamTools 安装程序...')
+    try:
+        async with session.get(setup_url, stream=True) as r:
+            if r.status == 200:
+                total_size = int(r.headers.get('Content-Length', 0))
+                chunk_size = 8192
+                progress = tqdm(total=total_size, unit='B', unit_scale=True, desc='下载安装程序')
+
+                async with aiofiles.open(setup_file, mode='wb') as f:
+                    async for chunk in r.content.iter_chunked(chunk_size):
+                        await f.write(chunk)
+                        progress.update(len(chunk))
+
+                progress.close()
+                log.info('安装程序下载完成')
+            else:
+                log.error('网络错误，无法下载安装程序')
+    except KeyboardInterrupt:
+        log.info("\n 程序已退出")
+    except Exception as e:
+        log.error(f'下载失败: {e}')
+    except ConnectionTimeoutError as e:
+        log.error(f'下载时超时: {e}')
+
+async def migrate(st_use: bool, session) -> None:
+    if st_use:
+        log.info('检测到你正在使用 SteamTools,尝试迁移旧文件')
+
+        if directory.exists():
+            for file in directory.iterdir():
+                if file.is_file() and file.name.startswith("Onekey_unlock_"):
+                    new_filename = file.name[len("Onekey_unlock_"):]
 
                     try:
-                        os.replace(old_file, new_file)
-                        log.info(f'Renamed: {filename} -> {new_filename}')
+                        file.rename(directory / new_filename)
+                        log.info(f'Renamed: {file.name} -> {new_filename}')
                     except Exception as e:
-                        log.error(f'Failed to rename {filename} -> {new_filename}: {e}')
+                        log.error(f'重命名失败 {file.name} -> {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'
-            with requests.get(down_url, stream=True) as r:
-                if r.status_code == 200:
-                    with open(out_path, 'wb') as f:
-                        for chunk in r.iter_content(chunk_size=8192):
-                            f.write(chunk)
-                else:
-                    log.error('网络错误')
-            subprocess.run(str(out_path))
-            os.rmdir(temp_path)
+            log.error('故障,正在重新安装 SteamTools')
+            temp_path.mkdir(parents=True, exist_ok=True)
+
+            await download_setup_file(session)
+
+            subprocess.run(str(setup_file), check=True)
+            for file in temp_path.iterdir():
+                file.unlink()
+            temp_path.rmdir()
     else:
-        log.info('未使用SteamTools，停止迁移')
+        log.info('未使用 SteamTools,停止迁移')

common/st_unlock.py

@@ -8,18 +8,38 @@ from .get_steam_path import steam_path
 
 lock = asyncio.Lock()
 
-async def stool_add(depot_data, app_id):
+async def stool_add(depot_data: list, app_id: str) -> bool:
     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')
+        log.info(f'SteamTools 解锁文件生成: {lua_filepath}')
+        try:
+            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
+            luapacka_path = steam_path / "config" / "stplug-in" / "luapacka.exe"
+            log.info(f'正在处理文件: {lua_filepath}')
+
+            result = subprocess.run(
+                [str(luapacka_path), str(lua_filepath)], 
+                capture_output=True
+            )
+            if result.returncode != 0:
+                log.error(f'调用失败: {result.stderr.decode()}')
+                return False
+
+            log.info('处理完成')
+        except KeyboardInterrupt:
+            log.info("\n 程序已退出")
+        except Exception as e:
+            log.error(f'处理过程出现错误: {e}')
+            return False
+        finally:
+            if lua_filepath.exists():
+                os.remove(lua_filepath)
+                log.info(f'🗑️ 删除临时文件: {lua_filepath}')
+
+    return True

common/stack_error.py

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

main.py

@@ -1,7 +1,9 @@
-import os
-import time
+import sys
 import asyncio
+import re
 
+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
@@ -10,21 +12,46 @@ from common.main_func import main
 lock = asyncio.Lock()
 
 init()
+cinit()
 
 repos = [
-         'ikun0014/ManifestHub',
-         'Auiowu/ManifestAutoUpdate',
-         'tymolu233/ManifestAutoUpdate'
-        ]
+    'ikun0014/ManifestHub',
+    'Auiowu/ManifestAutoUpdate',
+    'tymolu233/ManifestAutoUpdate',
+]
+
+def prompt_app_id():
+    while True:
+        app_id = input(f"{Fore.CYAN}{Back.BLACK}{Style.BRIGHT}请输入游戏AppID: {Style.RESET_ALL}").strip()
+        if re.match(r'^\d+$', app_id):
+            return app_id
+        else:
+            print(f"{Fore.RED}无效的AppID, 请输入数字!{Style.RESET_ALL}")
+
+async def main_loop():
+    while True:
+        try:
+            app_id = prompt_app_id()
+            await main(app_id, repos)
+        except KeyboardInterrupt:
+            log.info("\n 程序已退出")
+        except EOFError:
+            break
+
+async def run():
+    try:
+        log.info('App ID可以在SteamDB或Steam商店链接页面查看')
+        await main_loop()
+    except KeyboardInterrupt:
+        log.info("\n 程序已退出")
+    except Exception as e:
+        log.error(f'发生错误: {stack_error(e)}, 将在5秒后退出')
+        await asyncio.sleep(5)
+
 if __name__ == '__main__':
     try:
-        while True:
-            log.info('App ID可以在SteamDB或Steam商店链接页面查看')
-            app_id = input("请输入游戏AppID：").strip()
-            asyncio.run(main(app_id, repos))
+        asyncio.run(run())
     except KeyboardInterrupt:
-        exit()
-    except Exception as e:
-        log.error(f' ⚠ 发生错误: {stack_error(e)}，将在5秒后退出')
-        time.sleep(5)
-        os.system('pause')
+        log.info("\n 程序已退出")
+    except SystemExit:
+        sys.exit()

package.json

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

requirements.txt

@@ -1,8 +1,8 @@
-aiofiles
-colorlog
-ujson
-vdf
-nuitka
-requests
-imageio
-aiohttp
+aiofiles==24.1.0
+aiohttp==3.10.2
+colorama==0.4.6
+colorlog==6.8.2
+Requests==2.32.3
+tqdm==4.66.5
+ujson==5.10.0
+vdf==3.4