1.2.9

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']

README.md

@@ -66,6 +66,5 @@ pip install -r requirements.txt
 ## 社区和支持
 加入我们的社区，参与讨论和支持：
 - [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)

common/check.py

@@ -1,6 +1,5 @@
 import time
-import ujson as json
-from aiohttp import ClientError
+from aiohttp import ClientError, ConnectionTimeoutError
 from .log import log
 from .stack_error import stack_error
 
@@ -17,14 +16,18 @@ async def check_github_api_rate_limit(headers, session):
                 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}')
+                log.info(f'🔄 剩余请求次数: {remaining_requests}')
 
                 if remaining_requests == 0:
-                    log.warning(f'⚠ GitHub API 请求数已用尽,将在 {reset_time_formatted} 重置,建议生成一个填在配置文件里')
+                    log.warning(f'⚠ GitHub API 请求数已用尽, 将在 {reset_time_formatted} 重置,建议生成一个填在配置文件里')
             else:
-                log.error('⚠ Github请求数检查失败,网络错误')
+                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

@@ -19,6 +19,8 @@ async def gen_config_file():
             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)}')
 
@@ -32,6 +34,8 @@ async def load_config():
         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")

common/dkey_merge.py

@@ -9,7 +9,7 @@ lock = asyncio.Lock()
 async def depotkey_merge(config_path: Path, depots_config: dict) -> bool:
     if not config_path.exists():
         async with lock:
-            log.error('👋 Steam默认配置不存在,可能是没有登录账号')
+            log.error('👋 Steam默认配置不存在, 可能是没有登录账号')
         return False
 
     try:
@@ -21,7 +21,7 @@ async def depotkey_merge(config_path: Path, depots_config: dict) -> bool:
                 config.get('InstallConfigStore', {}).get('Software', {}).get('valve')
 
         if steam is None:
-            log.error('⚠ 找不到Steam配置,请检查配置文件')
+            log.error('⚠ 找不到Steam配置, 请检查配置文件')
             return False
         
         depots = steam.setdefault('depots', {})
@@ -34,7 +34,9 @@ async def depotkey_merge(config_path: Path, depots_config: dict) -> bool:
         log.info('✅ 成功合并')
         return True
         
+    except KeyboardInterrupt:
+        log.info("\n👋 程序已退出")
     except Exception as e:
         async with lock:
-            log.error(f'❌ 合并失败,原因: {e}')
+            log.error(f'❌ 合并失败, 原因: {e}')
         return False

common/get_manifest_info.py

@@ -36,6 +36,8 @@ async def get_manifest(sha: str, path: str, steam_path: Path, repo: str, session
                 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

common/get_steam_path.py

@@ -12,6 +12,8 @@ def get_steam_path() -> 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("👋 程序已退出")
     except Exception as e:
         log.error(f'❌ Steam路径获取失败, {stack_error(e)}, 请检查是否正确安装Steam')
         os.system('pause')

common/init_text.py

@@ -16,10 +16,10 @@ def init():
     for line in banner_lines:
         print(line)
     
-    log.info('作者:ikun0014')
-    log.info('本项目采用GNU General Public License v3开源许可证')
-    log.info('版本:1.2.6')
-    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_qun')
-    log.warning('如果本项目中的Emoji(即表情包)无法正常显示,请使用支持Emoji的终端(例如Windows Terminal)')
+    log.info(f'作者: {Fore.RED}{Back.BLACK}{Style.BRIGHT}ikun0014{Style.RESET_ALL}')
+    log.info(f'{Fore.RED}{Back.BLACK}{Style.BRIGHT}本项目采用GNU General Public License v3开源许可证，请勿用于商业用途{Style.RESET_ALL}')
+    log.info('版本: 1.2.9')
+    log.info(f'{Fore.RED}{Back.BLACK}{Style.BRIGHT}项目Github仓库: https://github.com/ikunshare/Onekey{Style.RESET_ALL}')
+    log.info('官网: ikunshare.com')
+    log.warning('本项目完全开源免费, 如果你在淘宝, QQ群内通过购买方式获得, 赶紧回去骂商家死全家\n交流群组:\n    https://t.me/ikunshare_qun')
+    log.warning('如果本项目中的Emoji(即表情包)无法正常显示, 请使用支持Emoji的终端(例如Windows Terminal)')

common/main_func.py

@@ -1,6 +1,7 @@
 import os
-from aiohttp import ClientSession
+from aiohttp import ClientSession, ConnectionTimeoutError
 
+from common.checkcn import checkcn
 from common.config import config
 from common.dkey_merge import depotkey_merge
 from common.migration import migrate
@@ -19,9 +20,14 @@ 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
@@ -44,6 +50,8 @@ async def main(app_id: str, repos: list) -> bool:
         log.error(f'⚠ App ID无效')
         return False
     app_id = app_id_list[0]
+    
+    checkcn()
 
     async with ClientSession() as session:
         github_token = config.get("Github_Personal_Token", "")

common/manifest_down.py

@@ -1,32 +1,22 @@
-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: str, path: str, repo: str, session, chunk_size: int = 1024) -> bytearray:
-    url_list = [
-        f'https://jsdelivr.pai233.top/gh/{repo}@{sha}/{path}',
-        f'https://cdn.jsdmirror.com/gh/{repo}@{sha}/{path}',
-        f'https://raw.kkgithub.com/{repo}/{sha}/{path}',
-        f'https://raw.dgithub.xyz/{repo}/{sha}/{path}',
-        f'https://raw.githubusercontent.com/{repo}/{sha}/{path}'
-    ]
-    '''
-    下载时间 (20MB 从小到大):
-    https://jsdelivr.pai233.top/gh/{repo}@{sha}/{path} - 0.95秒
-    https://cdn.jsdmirror.com/gh/{repo}@{sha}/{path} - 6.74秒
-    https://raw.kkgithub.com/{repo}/{sha}/{path} - 6.76秒
-    https://raw.dgithub.xyz/{repo}/{sha}/{path} - 8.30秒
-    https://raw.gitmirror.com/{repo}/{sha}/{path} - 15.60秒
-    https://ghproxy.net/https://raw.githubusercontent.com/{repo}/{sha}/{path} - 16.59秒
-    https://fastly.jsdelivr.net/gh/{repo}@{sha}/{path} - 20.08秒
-    https://jsd.onmicrosoft.cn/gh/{repo}@{sha}/{path} - 22.07秒
-    https://gitdl.cn/https://raw.githubusercontent.com/{repo}/{sha}/{path} - 47.33秒
-    https://ghp.ci/https://raw.githubusercontent.com/{repo}/{sha}/{path} - 96.56秒
-    https://raw.githubusercontent.com/{repo}/{sha}/{path} - 458.75秒
-    https://cdn.jsdelivr.net/gh/{repo}@{sha}/{path} - 下载时出错
-    '''
+    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 > 0:
         for url in url_list:
@@ -44,8 +34,12 @@ async def get(sha: str, path: str, repo: str, session, chunk_size: int = 1024) -
                         return content
                     else:
                         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}')

common/migration.py

@@ -1,5 +1,6 @@
 import subprocess
 import aiofiles
+from aiohttp import ConnectionTimeoutError
 from pathlib import Path
 from tqdm.asyncio import tqdm
 from .log import log
@@ -28,8 +29,12 @@ async def download_setup_file(session) -> None:
                 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:

common/st_unlock.py

@@ -2,7 +2,6 @@ import os
 import asyncio
 import subprocess
 import aiofiles
-from pathlib import Path
 
 from .log import log
 from .get_steam_path import steam_path
@@ -33,6 +32,8 @@ async def stool_add(depot_data: list, app_id: str) -> bool:
                 return False
 
             log.info('✅ 处理完成')
+        except KeyboardInterrupt:
+            log.info("\n👋 程序已退出")
         except Exception as e:
             log.error(f'❌ 处理过程出现错误: {e}')
             return False

main.py

@@ -1,7 +1,6 @@
 import sys
 import asyncio
 import re
-import platform
 
 from colorama import Fore, Back, Style
 from colorama import init as cinit
@@ -21,38 +20,21 @@ repos = [
     'tymolu233/ManifestAutoUpdate',
 ]
 
-def check_system_msg():
-    os_type = platform.system()
-    try:
-        if os_type != 'Windows':
-            log.error(f'❌ 请使用Windows系统!当前系统:{os_type}')
-            sys.exit()
-    except Exception as e:
-        log.error(f'❌ 获取系统类型失败:{stack_error(e)}')
-        sys.exit()
-
-    try:
-        os_version = platform.version().split('.')[0]
-        if int(os_version) < 10:
-            log.error(f'❌ 请使用Windows 10或更高版本!当前版本:Windows {os_version}')
-            sys.exit()
-    except Exception as e:
-        log.error(f'❌ 获取系统版本失败：{stack_error(e)}')
-        sys.exit()
-
 def prompt_app_id():
     while True:
-        app_id = input(f"{Fore.CYAN}{Back.BLACK}{Style.BRIGHT}🤔 请输入游戏AppID:{Style.RESET_ALL}").strip()
+        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}")
+            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
 
@@ -61,14 +43,15 @@ async def run():
         log.info('❗ App ID可以在SteamDB或Steam商店链接页面查看')
         await main_loop()
     except KeyboardInterrupt:
-        log.info("👋 程序已退出")
+        log.info("\n👋 程序已退出")
     except Exception as e:
-        log.error(f' ⚠ 发生错误: {stack_error(e)},将在5秒后退出')
+        log.error(f'⚠ 发生错误: {stack_error(e)}, 将在5秒后退出')
         await asyncio.sleep(5)
 
 if __name__ == '__main__':
     try:
-        check_system_msg()
         asyncio.run(run())
+    except KeyboardInterrupt:
+        log.info("\n👋 程序已退出")
     except SystemExit:
         sys.exit()

package.json

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

requirements.txt

@@ -2,6 +2,7 @@ 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