Update.

xOS · xOS · commit 61a0bac3f6b5 · 2025-09-17T18:49:10.000+08:00
diff --git a/.github/sync.py b/.github/sync.py
@@ -2,11 +2,23 @@
 import time
 import requests
 import hashlib
-from github import Github
+from github import Github, Auth
+
+
+REQUEST_TIMEOUT = (10, 300)  # (connect timeout, read timeout)
+# 上传可能较慢，单独设置更长的读超时
+UPLOAD_TIMEOUT = (10, 900)
+MAX_DOWNLOAD_RETRIES = 3
+MAX_UPLOAD_RETRIES = 5
 
 
 def get_github_latest_release():
-    g = Github()
+    # 使用令牌提升速率配额
+    gh_token = os.environ.get('GH_TOKEN') or os.environ.get('GITHUB_TOKEN')
+    if gh_token:
+        g = Github(auth=Auth.Token(gh_token))
+    else:
+        g = Github()
     repo = g.get_repo("xOS/ServerStatus")
     release = repo.get_latest_release()
     if release:
@@ -17,13 +29,24 @@ def get_github_latest_release():
             url = asset.browser_download_url
             name = asset.name
 
-            response = requests.get(url)
-            if response.status_code == 200:
-                with open(name, 'wb') as f:
-                    f.write(response.content)
-                print(f"Downloaded {name}")
+            # 下载资产（流式 + 超时 + 有限重试）
+            for attempt in range(1, MAX_DOWNLOAD_RETRIES + 1):
+                try:
+                    with requests.get(url, stream=True, timeout=REQUEST_TIMEOUT) as r:
+                        if r.status_code == 200:
+                            with open(name, 'wb') as f:
+                                for chunk in r.iter_content(chunk_size=1024 * 256):
+                                    if chunk:
+                                        f.write(chunk)
+                            print(f"Downloaded {name}")
+                            break
+                        else:
+                            print(f"Failed to download {name}, status: {r.status_code}, attempt {attempt}/{MAX_DOWNLOAD_RETRIES}")
+                except requests.RequestException as e:
+                    print(f"Download error for {name}: {e} (attempt {attempt}/{MAX_DOWNLOAD_RETRIES})")
+                time.sleep(2 ** (attempt - 1))
             else:
-                print(f"Failed to download {name}")
+                raise RuntimeError(f"Failed to download {name} after {MAX_DOWNLOAD_RETRIES} attempts")
             file_abs_path = get_abs_path(asset.name)
             files.append(file_abs_path)
         sync_to_gitee(release.tag_name, release.body, files)
@@ -32,89 +55,134 @@ def get_github_latest_release():
 
 
 def delete_gitee_releases(latest_id, client, uri, token):
-    get_data = {
-        'access_token': token
-    }
+    # 仅当 latest_id 有效时执行保留最新
+    if not latest_id:
+        print('Skip delete_gitee_releases: latest_id is empty')
+        return
 
+    params = {'access_token': token, 'page': 1, 'per_page': 100}
     release_info = []
-    release_response = client.get(uri, json=get_data)
+    release_response = client.get(uri, params=params, timeout=REQUEST_TIMEOUT)
     if release_response.status_code == 200:
         release_info = release_response.json()
     else:
-        print(
-            f"Request failed with status code {release_response.status_code}")
+        print(f"List releases failed: {release_response.status_code} {release_response.text}")
+        return
 
     release_ids = []
     for block in release_info:
         if 'id' in block:
             release_ids.append(block['id'])
 
     print(f'Current release ids: {release_ids}')
-    release_ids.remove(latest_id)
-
-    for id in release_ids:
-        release_uri = f"{uri}/{id}"
-        delete_data = {
-            'access_token': token
-        }
-        delete_response = client.delete(release_uri, json=delete_data)
+    if latest_id in release_ids:
+        release_ids.remove(latest_id)
+
+    for rid in release_ids:
+        release_uri = f"{uri}/{rid}"
+        delete_response = client.delete(release_uri, params={'access_token': token}, timeout=REQUEST_TIMEOUT)
         if delete_response.status_code == 204:
-            print(f'Successfully deleted release #{id}.')
+            print(f'Successfully deleted release #{rid}.')
         else:
-            raise ValueError(
-                f"Request failed with status code {delete_response.status_code}")
+            raise ValueError(f"Delete release #{rid} failed: {delete_response.status_code} {delete_response.text}")
 
 
 def sync_to_gitee(tag: str, body: str, files: slice):
     release_id = ""
-    owner = "Ten"
-    repo = "ServerStatus"
+    owner = os.environ.get('GITEE_OWNER', 'Ten')
+    repo = os.environ.get('GITEE_REPO', 'ServerStatus')
     release_api_uri = f"https://gitee.com/api/v5/repos/{owner}/{repo}/releases"
     api_client = requests.Session()
     api_client.headers.update({
         'Accept': 'application/json',
-        'Content-Type': 'application/json'
+        # 对于 form 提交不强制指定 JSON 头
     })
 
     access_token = os.environ['GITEE_TOKEN']
-    release_data = {
+    release_form = {
         'access_token': access_token,
         'tag_name': tag,
         'name': tag,
         'body': body,
-        'prerelease': False,
+        'prerelease': 'false',
         'target_commitish': 'master'
     }
-    release_api_response = api_client.post(release_api_uri, json=release_data)
+    # 优先尝试创建（表单提交）
+    release_api_response = api_client.post(release_api_uri, data=release_form, timeout=REQUEST_TIMEOUT)
     if release_api_response.status_code == 201:
         release_info = release_api_response.json()
         release_id = release_info.get('id')
     else:
-        print(
-            f"Request failed with status code {release_api_response.status_code}")
+        print(f"Create release failed: {release_api_response.status_code} {release_api_response.text}")
+        # 如果已存在同名 tag，则尝试查找已存在的发布并复用其 id
+        list_resp = api_client.get(release_api_uri, params={'access_token': access_token, 'page': 1, 'per_page': 100}, timeout=REQUEST_TIMEOUT)
+        if list_resp.status_code == 200:
+            for rel in list_resp.json():
+                if rel.get('tag_name') == tag:
+                    release_id = rel.get('id')
+                    print(f"Found existing Gitee release id: {release_id} for tag {tag}")
+                    break
+        else:
+            print(f"List releases failed: {list_resp.status_code} {list_resp.text}")
 
     print(f"Gitee release id: {release_id}")
+    if not release_id:
+        raise RuntimeError(f"No Gitee release id available for tag {tag}. Please ensure repo {owner}/{repo} exists and token has permission.")
     asset_api_uri = f"{release_api_uri}/{release_id}/attach_files"
+    # 列出现有资产，避免重复上传导致 400/405
+    existing_assets = {}
+    try:
+        # 获取单个 release 详情，其中包含 assets 列表
+        release_detail_resp = api_client.get(f"{release_api_uri}/{release_id}", params={'access_token': access_token}, timeout=REQUEST_TIMEOUT)
+        if release_detail_resp.status_code == 200:
+            data = release_detail_resp.json()
+            assets = data.get('assets') or []
+            for a in assets:
+                name = a.get('name')
+                if name:
+                    existing_assets[name] = a.get('id')
+            print(f"Existing assets: {list(existing_assets.keys())}")
+        else:
+            print(f"Get release detail failed: {release_detail_resp.status_code} {release_detail_resp.text}")
+    except requests.RequestException as e:
+        print(f"List assets error: {e}")
 
     for file_path in files:
+        file_name = os.path.basename(file_path)
         success = False
-
-        while not success:
-            files = {
-                'file': open(file_path, 'rb')
-            }
-
-            asset_api_response = requests.post(
-                asset_api_uri, params={'access_token': access_token}, files=files)
-
-            if asset_api_response.status_code == 201:
-                asset_info = asset_api_response.json()
-                asset_name = asset_info.get('name')
-                print(f"Successfully uploaded {asset_name}!")
-                success = True
-            else:
-                print(
-                    f"Request failed with status code {asset_api_response.status_code}")
+        for attempt in range(1, MAX_UPLOAD_RETRIES + 1):
+            try:
+                # 如果已存在同名资产，则跳过上传
+                if file_name in existing_assets:
+                    print(f"Skip upload {file_name}: already exists in release (asset id {existing_assets[file_name]})")
+                    success = True
+                    break
+                with open(file_path, 'rb') as fh:
+                    resp = api_client.post(
+                        asset_api_uri,
+                        params={'access_token': access_token},
+                        files={'file': (file_name, fh, 'application/octet-stream')},
+                        timeout=UPLOAD_TIMEOUT,
+                    )
+                if resp.status_code == 201:
+                    asset_info = resp.json()
+                    asset_name = asset_info.get('name')
+                    print(f"Successfully uploaded {asset_name}!")
+                    success = True
+                    break
+                else:
+                    # 某些情况下返回400且文案提示已存在，视为成功
+                    txt = resp.text
+                    if resp.status_code in (400, 409, 422) and ('已存在' in txt or 'already exists' in txt):
+                        print(f"Asset {file_name} already exists, treat as success.")
+                        success = True
+                        break
+                    print(f"Upload failed (status {resp.status_code}) for {file_path}, attempt {attempt}/{MAX_UPLOAD_RETRIES}. Body: {txt[:256]}")
+            except requests.RequestException as e:
+                print(f"Upload error for {file_path}: {e} (attempt {attempt}/{MAX_UPLOAD_RETRIES})")
+            time.sleep(min(60, 2 ** (attempt - 1)))
+        if not success:
+            raise RuntimeError(f"Failed to upload {file_path} after {MAX_UPLOAD_RETRIES} attempts")
 
     # 仅保留最新 Release 以防超出 Gitee 仓库配额
     try:
diff --git a/.github/workflows/sync-release.yml b/.github/workflows/sync-release.yml
@@ -6,9 +6,10 @@ on:
 jobs:
   sync-release-to-gitee:
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 60
     env:
       GITEE_TOKEN: ${{ secrets.GITEE_TOKEN }}
+      GH_TOKEN: ${{ github.token }}
     steps:
       - uses: actions/checkout@v4
       - name: Sync to Gitee
