1.2.8

.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
 
@@ -26,5 +25,7 @@ async def check_github_api_rate_limit(headers, session):
     
     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,22 @@
+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')
+        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 Exception as e:
+        os.environ['IS_CN'] = 'yes'
+        log.warning('❗ 检查服务器位置失败，已忽略，自动认为你在中国大陆')
+        log.warning(stack_error(e))
+        return False

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
@@ -22,6 +23,9 @@ async def fetch_branch_info(session, url, headers):
     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 +48,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:
@@ -46,6 +36,8 @@ async def get(sha: str, path: str, repo: str, session, chunk_size: int = 1024) -
                         log.error(f'🔄 获取失败: {path} - 状态码: {response.status}')
             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
@@ -30,6 +31,8 @@ async def download_setup_file(session) -> None:
                 log.error('⚠ 网络错误，无法下载安装程序')
     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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "onekey",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "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