Spaces:

a3216
/

xtc-backend

Running

App Files Files Community

a3216 commited on 3 days ago

Commit

1e30792

verified ·

1 Parent(s): 86211da

sync from GitHub c8523f8: feat(admin): one-click clear all V6 backups, merge backup panels, logs API

Browse files

Files changed (9) hide show

.gitignore +0 -4
app/admin_html.py +120 -22
app/api/admin.py +0 -37
app/api/admin_data.py +108 -1
app/api/logs.py +29 -0
app/api/user_backups_v6.py +1 -18
app/database.py +0 -13
app/main.py +0 -2
app/services/backup_v6_store.py +59 -157

.gitignore CHANGED Viewed

@@ -35,7 +35,3 @@ ENV/
 # OS
 .DS_Store
 Thumbs.db
-_smoke_deps/
-_smoke_tmp/
-_commit_msg.txt

 # OS
 .DS_Store
 Thumbs.db

app/admin_html.py CHANGED Viewed

@@ -363,11 +363,11 @@ _HTML_TEMPLATE = """<!DOCTYPE html>
   <button data-tab="users">用户</button>
   <button data-tab="files">文件</button>
   <button data-tab="backups">备份</button>
-  <button data-tab="backups_v5">v5备份</button>
   <button data-tab="usage">用量</button>
   <button data-tab="webhooks">Webhook</button>
   <button data-tab="audit">审计</button>
   <button data-tab="requests">请求历史</button>
   <button data-tab="devices">设备</button>
   <button data-tab="tts">TTS</button>
   <button data-tab="music-records">识曲录音</button>
@@ -537,10 +537,10 @@ _HTML_TEMPLATE = """<!DOCTYPE html>
       </div>
     </div>
-    <!-- 备份 -->
     <div class="tab-content" data-tab="backups">
       <div class="card">
-        <h2>备份管理（全部用户）</h2>
         <div class="row" style="margin-bottom:12px;flex-wrap:wrap;gap:8px">
           <input id="backupsQ" placeholder="搜索别名/账号" style="flex:1;min-width:160px">
           <input id="backupsUser" placeholder="用户ID过滤" style="width:120px">
@@ -551,19 +551,18 @@ _HTML_TEMPLATE = """<!DOCTYPE html>
         <p class="hint">说明：Space 重启后首次访问会自动从 Hub 同步，60 秒内不重复拉取。若列表为空且确认有数据，点"从 Hub 同步"强制刷新。</p>
         <div id="backupsList">点查询开始</div>
       </div>
-    </div>
-    <!-- v5 备份 -->
-    <div class="tab-content" data-tab="backups_v5">
       <div class="card">
-        <h2>v5 备份管理（全部用户）</h2>
         <div class="row" style="margin-bottom:12px;flex-wrap:wrap;gap:8px">
-          <input id="backupsV5Q" placeholder="搜索别名" style="flex:1;min-width:160px">
-          <button onclick="loadBackupsV5()">查询</button>
-          <button class="ghost" onclick="loadBackupsV5()">刷新</button>
         </div>
-        <p class="hint">说明：基于 backup_sets 表的 v5 备份集（内容寻址 blob + manifest），跨用户视图。</p>
-        <div id="backupsV5List">点查询开始</div>
       </div>
     </div>
@@ -721,6 +720,44 @@ _HTML_TEMPLATE = """<!DOCTYPE html>
       </div>
     </div>
     <!-- 设备 -->
     <div class="tab-content" data-tab="devices">
       <div class="card">
@@ -1012,7 +1049,6 @@ document.querySelectorAll('nav.tabs button').forEach(btn => {
     else if (tab === 'users') loadUsers();
     else if (tab === 'files') loadFiles();
     else if (tab === 'backups') loadBackups();
-    else if (tab === 'backups_v5') loadBackupsV5();
     else if (tab === 'webhooks') loadWebhooks();
     else if (tab === 'requests') { loadReqLimit(); loadRequests(1); loadReqStats(); }
     else if (tab === 'devices') loadDevices(1);
@@ -1439,15 +1475,17 @@ async function loadFiles() {
 async function loadBackups() {
   return _loadDataItems('/admin/api/backups', 'backupsList', 'backupsQ', $('backupsUser').value.trim(), '备份');
 }
-async function loadBackupsV5() {
-  const el = $('backupsV5List');
   el.innerHTML = '<div class="muted">加载中...</div>';
   try {
     const p = new URLSearchParams();
-    const q = $('backupsV5Q') ? $('backupsV5Q').value.trim() : '';
     if (q) p.set('q', q);
     p.set('limit', '200');
-    const data = await api('/admin/api/backups_v5' + (p.toString() ? ('?' + p.toString()) : ''));
     const items = data.items || [];
     if (!items.length) { el.innerHTML = '<div class="muted">暂无数据</div>'; return; }
     el.innerHTML = '<table><tr><th>Set ID</th><th>用户</th><th>别名</th><th>大小</th><th>文件数</th><th>创建时间</th><th>是否最新</th><th>操作</th></tr>' +
@@ -1459,19 +1497,79 @@ async function loadBackupsV5() {
         <td>${it.blob_count||0}</td>
         <td>${fmtTime(it.created_at)}</td>
         <td>${it.is_latest?'<span class="tag ok">是</span>':'-'}</td>
-        <td><button class="danger small" onclick="delBackupV5('${esc(it.set_id)}')">删除</button></td>
       </tr>`).join('') +
       '</table><p class="muted" style="margin-top:8px">本页 ' + items.length + ' 项 / 总计 ' + (data.count||items.length) + '</p>';
   } catch (e) { el.innerHTML = '<div class="muted">' + esc(e.message) + '</div>'; }
 }
-async function delBackupV5(setId) {
-  if (!confirm('确认删除 v5 备份集 ' + (setId||'').slice(0,8) + '...? 不可恢复！')) return;
   try {
-    await api('/admin/api/backups_v5/' + encodeURIComponent(setId), { method: 'DELETE' });
     toast('已删除');
-    loadBackupsV5();
   } catch (e) { toast(e.message, true); }
 }
 function _refreshActiveDataTab() {
   if ($('filesList').innerHTML && $('filesList').innerHTML.indexOf('加载中') < 0) loadFiles();
   if ($('backupsList').innerHTML && $('backupsList').innerHTML.indexOf('加载中') < 0) loadBackups();

   <button data-tab="users">用户</button>
   <button data-tab="files">文件</button>
   <button data-tab="backups">备份</button>
   <button data-tab="usage">用量</button>
   <button data-tab="webhooks">Webhook</button>
   <button data-tab="audit">审计</button>
   <button data-tab="requests">请求历史</button>
+  <button data-tab="logs">日志</button>
   <button data-tab="devices">设备</button>
   <button data-tab="tts">TTS</button>
   <button data-tab="music-records">识曲录音</button>
       </div>
     </div>
+    <!-- 备份（普通 + V6，已合并） -->
     <div class="tab-content" data-tab="backups">
       <div class="card">
+        <h2>普通备份管理（全部用户）</h2>
         <div class="row" style="margin-bottom:12px;flex-wrap:wrap;gap:8px">
           <input id="backupsQ" placeholder="搜索别名/账号" style="flex:1;min-width:160px">
           <input id="backupsUser" placeholder="用户ID过滤" style="width:120px">
         <p class="hint">说明：Space 重启后首次访问会自动从 Hub 同步，60 秒内不重复拉取。若列表为空且确认有数据，点"从 Hub 同步"强制刷新。</p>
         <div id="backupsList">点查询开始</div>
       </div>
       <div class="card">
+        <h2>V6 备份管理（全部用户）</h2>
         <div class="row" style="margin-bottom:12px;flex-wrap:wrap;gap:8px">
+          <input id="backupsV6Q" placeholder="搜索别名" style="flex:1;min-width:160px">
+          <input id="backupsV6User" placeholder="用户ID过滤" style="width:120px">
+          <button onclick="loadBackupsV6()">查询</button>
+          <button class="ghost" onclick="loadBackupsV6()">刷新</button>
+          <button class="danger" onclick="clearAllV6Backups()" title="清空所有用户的 V6 备份点与 blob（DB/本地/Hub 三处）。清空后客户端下次备份将判定为非增量，强制刷新成全量备份一次，用于修复 v6 备份集因同步问题损坏的场景。此操作不可恢复！">一键清空 V6 备份</button>
         </div>
+        <p class="hint">说明：基于 backup_v6_sets 表的 v6 备份点（快照模型 + 分片上传 + ZIP 卷），跨用户视图。若 v6 备份集因同步问题损坏，点"一键清空 V6 备份"重置到最初始状态，强制全量刷新。</p>
+        <div id="backupsV6List">点查询开始</div>
       </div>
     </div>
       </div>
     </div>
+    <!-- 日志（日志 API 密钥生成 + 请求日志查询） -->
+    <div class="tab-content" data-tab="logs">
+      <div class="card">
+        <h2>日志 API 密钥</h2>
+        <p class="hint">生成一个临时访问令牌（JWT），用于携带调用日志查询接口 <code>/logs/api/query</code>。</p>
+        <div class="row" style="gap:8px;flex-wrap:wrap">
+          <button onclick="genLogApiKey()">生成日志 API 密钥</button>
+          <button class="ghost" onclick="clearLogApiKey()">清空</button>
+        </div>
+        <div id="logApiKeyBox" class="muted" style="margin-top:12px">未生成。生成后密钥会显示在此处，可配合下方"通过密钥查询"使用。</div>
+        <div class="row" style="margin-top:8px;gap:6px">
+          <input id="logApiKeyInput" placeholder="将密钥填写到此处，也可直接粘贴使用">
+          <button class="ghost" onclick="copyLogApiKey()">复制</button>
+        </div>
+        <p class="muted">携带方式二选一：<code>Authorization: Bearer &lt;key&gt;</code> 或 <code>x-xtc-access-key: &lt;key&gt;</code>。</p>
+      </div>
+      <div class="card">
+        <h2>通过密钥查询请求日志</h2>
+        <div class="row" style="margin-bottom:12px;flex-wrap:wrap;gap:8px">
+          <select id="logApiHours">
+            <option value="24" selected>最近 24 小时</option>
+            <option value="1">最近 1 小时</option>
+            <option value="48">最近 48 小时</option>
+            <option value="168">最近 7 天</option>
+          </select>
+          <select id="logApiLimit">
+            <option value="50">50 条</option>
+            <option value="100" selected>100 条</option>
+            <option value="200">200 条</option>
+            <option value="500">500 条</option>
+          </select>
+          <button onclick="queryLogsByKey()">查询</button>
+        </div>
+        <div id="logApiList"><div class="muted">用上方生成的密钥查询业务请求（/v1/*）摘要。</div></div>
+      </div>
+    </div>
     <!-- 设备 -->
     <div class="tab-content" data-tab="devices">
       <div class="card">
     else if (tab === 'users') loadUsers();
     else if (tab === 'files') loadFiles();
     else if (tab === 'backups') loadBackups();
     else if (tab === 'webhooks') loadWebhooks();
     else if (tab === 'requests') { loadReqLimit(); loadRequests(1); loadReqStats(); }
     else if (tab === 'devices') loadDevices(1);
 async function loadBackups() {
   return _loadDataItems('/admin/api/backups', 'backupsList', 'backupsQ', $('backupsUser').value.trim(), '备份');
 }
+async function loadBackupsV6() {
+  const el = $('backupsV6List');
   el.innerHTML = '<div class="muted">加载中...</div>';
   try {
     const p = new URLSearchParams();
+    const q = $('backupsV6Q') ? $('backupsV6Q').value.trim() : '';
+    const uid = $('backupsV6User') ? $('backupsV6User').value.trim() : '';
     if (q) p.set('q', q);
+    if (uid) p.set('user_id', uid);
     p.set('limit', '200');
+    const data = await api('/admin/api/backups_v6' + (p.toString() ? ('?' + p.toString()) : ''));
     const items = data.items || [];
     if (!items.length) { el.innerHTML = '<div class="muted">暂无数据</div>'; return; }
     el.innerHTML = '<table><tr><th>Set ID</th><th>用户</th><th>别名</th><th>大小</th><th>文件数</th><th>创建时间</th><th>是否最新</th><th>操作</th></tr>' +
         <td>${it.blob_count||0}</td>
         <td>${fmtTime(it.created_at)}</td>
         <td>${it.is_latest?'<span class="tag ok">是</span>':'-'}</td>
+        <td><button class="danger small" onclick="delBackupV6('${esc(it.set_id)}')">删除</button></td>
       </tr>`).join('') +
       '</table><p class="muted" style="margin-top:8px">本页 ' + items.length + ' 项 / 总计 ' + (data.count||items.length) + '</p>';
   } catch (e) { el.innerHTML = '<div class="muted">' + esc(e.message) + '</div>'; }
 }
+async function delBackupV6(setId) {
+  if (!confirm('确认删除 V6 备份集 ' + (setId||'').slice(0,8) + '...? 不可恢复！')) return;
   try {
+    await api('/admin/api/backups_v6/' + encodeURIComponent(setId), { method: 'DELETE' });
     toast('已删除');
+    loadBackupsV6();
+  } catch (e) { toast(e.message, true); }
+}
+async function clearAllV6Backups() {
+  if (!confirm('确认一键清空【所有用户】的 V6 备份（DB/本地/Hub 三处全部删除）？\n\n清空后客户端下次备份将判定为非增量，强制刷新成全量备份一次。\n此操作不可恢复！确定继续？')) return;
+  if (!confirm('再次确认：这会把所有用户的 V6 备份点与 blob 全部清除，无法撤销。')) return;
+  try {
+    const r = await api('/admin/api/backups_v6/clear-all', { method: 'DELETE' });
+    toast('已清空 V6 备份：备份点 ' + (r.deletedSets||0) + ' 个，blob ' + (r.deletedBlobs||0) + ' 个');
+    loadBackupsV6();
   } catch (e) { toast(e.message, true); }
 }
+// ===== 日志 API 密钥 =====
+async function genLogApiKey() {
+  try {
+    const data = await api('/admin/api/xtc-access-token', { method: 'POST', body: {} });
+    const token = data.token || data.access_token || data.jti || '';
+    if (!token) throw new Error('接口未返回 token');
+    $('logApiKeyBox').innerHTML = '<div class="mono" style="word-break:break-all">' + esc(token) + '</div>';
+    if ($('logApiKeyInput')) $('logApiKeyInput').value = token;
+    toast('已生成日志 API 密钥');
+  } catch (e) { toast('生成失败：' + e.message, true); }
+}
+function clearLogApiKey() {
+  if ($('logApiKeyInput')) $('logApiKeyInput').value = '';
+  $('logApiKeyBox').textContent = '未生成。生成后密钥会显示在此处，可配合下方"通过密钥查询"使用。';
+}
+function copyLogApiKey() {
+  const input = $('logApiKeyInput');
+  if (!input || !input.value) return toast('请先生成并填入密钥', true);
+  input.select();
+  navigator.clipboard && navigator.clipboard.writeText(input.value).then(() => toast('已复制')).catch(() => toast('复制失败', true));
+}
+async function queryLogsByKey() {
+  const key = $('logApiKeyInput') ? $('logApiKeyInput').value.trim() : '';
+  if (!key) return toast('请先生成并填入日志 API 密钥', true);
+  const el = $('logApiList');
+  el.innerHTML = '<div class="muted">加载中...</div>';
+  try {
+    const hours = $('logApiHours').value;
+    const limit = $('logApiLimit').value;
+    const r = await fetch('/logs/api/query?hours=' + hours + '&limit=' + limit, {
+      headers: { 'x-xtc-access-key': key }
+    });
+    const data = await r.json().catch(() => ({}));
+    if (!r.ok || data.ok === false) {
+      throw new Error((data.error && data.error.message) || ('HTTP ' + r.status));
+    }
+    const items = data.items || [];
+    if (!items.length) { el.innerHTML = '<div class="muted">暂无业务请求日志（最近 ' + hours + ' 小时）</div>'; return; }
+    el.innerHTML = '<table><tr><th>时间</th><th>方法</th><th>路径</th><th>状态</th><th>耗时</th><th>模型</th><th>结果</th></tr>' +
+      items.map(it => `<tr>
+        <td class="mono">${fmtTime(it.ts)}</td>
+        <td>${esc(it.method||'')}</td>
+        <td class="mono">${esc(it.path||'')}</td>
+        <td>${it.status_code||'-'}</td>
+        <td class="mono">${it.elapsed_ms!=null ? (it.elapsed_ms+'ms') : '-'}</td>
+        <td class="mono">${esc(it.model||'-')}</td>
+        <td>${it.ok?'<span class="tag ok">成功</span>':('<span class="tag err">失败</span>' + (it.error_code?(' '+esc(it.error_code)):''))}</td>
+      </tr>`).join('') +
+      '</table><p class="muted" style="margin-top:8px">本页 ' + items.length + ' 项 / 总计 ' + (data.total||items.length) + '</p>';
+  } catch (e) { el.innerHTML = '<div class="muted">' + esc(e.message) + '</div>'; }
+}
 function _refreshActiveDataTab() {
   if ($('filesList').innerHTML && $('filesList').innerHTML.indexOf('加载中') < 0) loadFiles();
   if ($('backupsList').innerHTML && $('backupsList').innerHTML.indexOf('加载中') < 0) loadBackups();

app/api/admin.py CHANGED Viewed

@@ -184,43 +184,6 @@ async def revoke_token(
     return ok_with_cors({"revoked": ok})
-# ===== 日志查询 API Key（凭 key 调用 /api/logs，可吊销）=====
-@router.post("/log-keys")
-async def generate_log_key(
-    body: dict = Body(default={}),
-    _admin: str = Depends(_require_admin),
-):
-    """生成日志查询 API key。完整 key 仅本次响应返回一次。"""
-    from ..services import log_api_key_store
-    name = str(body.get("name") or "").strip()
-    info = log_api_key_store.generate_key(name)
-    return ok_with_cors(info)
-@router.get("/log-keys")
-async def list_log_keys(_admin: str = Depends(_require_admin)):
-    from ..services import log_api_key_store
-    return ok_with_cors({"keys": log_api_key_store.list_keys()})
-@router.post("/log-keys/revoke")
-async def revoke_log_key(
-    body: dict = Body(default={}),
-    _admin: str = Depends(_require_admin),
-):
-    """吊销日志查询 API key（body: {key: 完整 key}）。"""
-    from ..services import log_api_key_store
-    key = body.get("key")
-    if not key:
-        raise HttpError("key is required", status=400, code="bad_request")
-    revoked = log_api_key_store.revoke_key(str(key))
-    return ok_with_cors({"revoked": revoked})
 # ===== 配置 =====
 @router.get("/config")

     return ok_with_cors({"revoked": ok})
 # ===== 配置 =====
 @router.get("/config")

app/api/admin_data.py CHANGED Viewed

@@ -16,6 +16,7 @@
 from __future__ import annotations
 import asyncio
 import logging
 import time
 import urllib.parse
@@ -26,7 +27,7 @@ from fastapi.responses import Response
 from ..database import get_conn
 from ..errors import HttpError
 from ..hf_storage import is_hub_enabled
-from ..services import backup_v5_store, session_store, user_files_store
 from ._common import CORS_HEADERS, audit_admin, ok_with_cors, read_json_body
 from .admin import _require_admin
@@ -466,6 +467,112 @@ async def delete_backup_v5(
     return ok_with_cors({"deleted": True, "set_id": set_id, **result})
 # ===== 文件 / 备份 管理操作 =====
 def _get_meta_row(key: str):

 from __future__ import annotations
 import asyncio
+import json
 import logging
 import time
 import urllib.parse
 from ..database import get_conn
 from ..errors import HttpError
 from ..hf_storage import is_hub_enabled
+from ..services import backup_v5_store, backup_v6_store, session_store, user_files_store
 from ._common import CORS_HEADERS, audit_admin, ok_with_cors, read_json_body
 from .admin import _require_admin
     return ok_with_cors({"deleted": True, "set_id": set_id, **result})
+# ===== v6 备份管理（新备份体系，跨用户视图）=====
+@router.get("/backups_v6")
+async def list_backups_v6(
+    _admin: str = Depends(_require_admin),
+    limit: int = Query(default=100, ge=1, le=500),
+    offset: int = Query(default=0, ge=0),
+    user_id: str | None = Query(default=None, alias="user_id"),
+    q: str | None = Query(default=None),
+):
+    """列出所有用户的 v6 备份点（基于 backup_v6_sets 表，跨用户视图）。
+    返回字段：set_id, user_id, alias, total_size, blob_count,
+    created_at, is_latest, prev_set_id, mode, device, manifest。
+    """
+    where = " WHERE 1=1"
+    args: list = []
+    if user_id:
+        where += " AND user_id = ?"
+        args.append(user_id)
+    if q:
+        where += " AND alias LIKE ?"
+        args.append(f"%{q}%")
+    with get_conn() as conn:
+        total = conn.execute(
+            "SELECT COUNT(*) AS c FROM backup_v6_sets" + where, args
+        ).fetchone()["c"]
+        items = []
+        if limit > 0:
+            rows = conn.execute(
+                "SELECT set_id, user_id, alias, manifest, total_size, blob_count, "
+                "created_at, is_latest, prev_set_id, mode, device "
+                "FROM backup_v6_sets" + where +
+                " ORDER BY created_at DESC LIMIT ? OFFSET ?",
+                args + [limit, offset],
+            ).fetchall()
+            for r in rows:
+                d = dict(r)
+                try:
+                    m = json.loads(d["manifest"] or "{}")
+                except Exception:
+                    m = {}
+                d["set_id"] = str(d["set_id"])
+                d["exportedAt"] = (m.get("exportedAt") if isinstance(m, dict) else None) \
+                    or int(d["created_at"])
+                items.append(d)
+    return ok_with_cors({"items": items, "count": total})
+@router.delete("/backups_v6/clear-all")
+async def clear_all_v6_backups(
+    admin_key: str = Depends(_require_admin),
+):
+    """一键清空全部 V6 备份（所有用户的备份点 + blob，DB/本地/Hub 三处清理）。
+    用于修复"v6 备份集因同步问题损坏"：清空后各用户下次备份判定为非增量，
+    强制刷新成全量备份一次。该操作不可恢复。
+    """
+    result = await asyncio.to_thread(backup_v6_store.purge_all_v6)
+    logger.info(
+        "[admin] clear all v6 backups: sets=%s blobs=%s",
+        result.get("deletedSets"), result.get("deletedBlobs"),
+    )
+    _audit_admin(
+        "admin.backup_v6.clear_all",
+        admin_key,
+        target="all",
+        deletedSets=result.get("deletedSets", 0),
+        deletedBlobs=result.get("deletedBlobs", 0),
+    )
+    return ok_with_cors({"ok": True, **result})
+@router.delete("/backups_v6/{set_id}")
+async def delete_backup_v6(
+    set_id: str,
+    admin_key: str = Depends(_require_admin),
+):
+    """管理员删除任意用户的 v6 备份点（不需 user_id 校验，可直接指定 set_id）。"""
+    owner = backup_v6_store.get_set_owner(set_id)
+    if not owner:
+        raise HttpError(f"v6 backup set not found: {set_id}", status=404, code="not_found")
+    try:
+        result = backup_v6_store.delete_set(set_id, owner)
+    except ValueError as e:
+        msg = str(e)
+        if msg == "set_not_found":
+            raise HttpError(f"v6 backup set not found: {set_id}", status=404, code="not_found")
+        if msg == "forbidden":
+            raise HttpError("forbidden", status=403, code="forbidden")
+        raise HttpError(f"delete failed: {msg}", status=500, code="delete_failed")
+    logger.info(
+        "[admin delete] v6 backup set=%s owner=%s freedBlobs=%s freedBytes=%s",
+        set_id, owner, result.get("freedBlobs"), result.get("freedBytes"),
+    )
+    _audit_admin(
+        "admin.backup_v6.delete",
+        admin_key,
+        target=set_id,
+        owner=owner,
+        freedBlobs=result.get("freedBlobs", 0),
+        freedBytes=result.get("freedBytes", 0),
+    )
+    return ok_with_cors({"deleted": True, "set_id": set_id, **result})
 # ===== 文件 / 备份 管理操作 =====
 def _get_meta_row(key: str):

app/api/logs.py CHANGED Viewed

@@ -5,6 +5,7 @@
 - POST /logs/api/log/batch 批量日志（需 access_key）
 - GET  /logs/api/stats    统计（admin）
 - GET  /logs/api/logs     查询（admin）
 """
 from __future__ import annotations
@@ -16,6 +17,7 @@ from fastapi import APIRouter, Depends, Query
 from ..auth import require_access_key, require_admin_key
 from ..database import get_conn
 from ._common import ok_with_cors
 router = APIRouter(prefix="/logs/api", tags=["logs"])
@@ -157,3 +159,30 @@ async def list_logs(
             }
         )
     return ok_with_cors({"items": items, "count": len(items)})

 - POST /logs/api/log/batch 批量日志（需 access_key）
 - GET  /logs/api/stats    统计（admin）
 - GET  /logs/api/logs     查询（admin）
+- GET  /logs/api/query    查询请求日志（需 access_key，供日志API密钥调用）
 """
 from __future__ import annotations
 from ..auth import require_access_key, require_admin_key
 from ..database import get_conn
+from ..services import request_log_store
 from ._common import ok_with_cors
 router = APIRouter(prefix="/logs/api", tags=["logs"])
             }
         )
     return ok_with_cors({"items": items, "count": len(items)})
+@router.get("/query")
+async def query_request_logs(
+    _key: str = Depends(require_access_key),
+    hours: int = Query(default=24, ge=1, le=720),
+    limit: int = Query(default=100, ge=1, le=500),
+    offset: int = Query(default=0, ge=0),
+):
+    """通过日志 API 密钥（access key / 临时令牌）查询后端的请求日志。
+    携带密钥方式（二选一，与 XTC 客户端一致）：
+    - Authorization: Bearer <key>
+    - x-xtc-access-key: <key>
+    默认只返回业务请求（/v1/*）摘要，不含请求/响应体等敏感全文。
+    """
+    result = request_log_store.list_records(
+        limit=limit, offset=offset, hours=hours, category="business",
+    )
+    return ok_with_cors({
+        "items": result.get("items", []),
+        "count": result.get("count", 0),
+        "total": result.get("total", 0),
+        "limit": limit,
+        "offset": offset,
+    })

app/api/user_backups_v6.py CHANGED Viewed

@@ -148,18 +148,6 @@ async def commit_manifest(set_id: str, request: Request):
             "blob_missing", "manifest 引用了未上传的 blob",
             missing_keys=still_missing[:20],
         )
-    # ★ 提交前强制确认所有 blob 已落 Hub（堵住静默丢失：本地有但 Hub 没有，
-    # Space 重启清盘后 blob 永久丢失。失败则拒绝提交，客户端可重试）
-    try:
-        push_failed = await backup_v6_store.ensure_blobs_on_hub(keys)
-    except Exception as e:
-        raise _err("blob_push_failed", f"blob 同步到 Hub 失败: {e}", status=503)
-    if push_failed:
-        raise _err(
-            "blob_push_failed", "部分 blob 同步到 Hub 失败，请稍后重试提交",
-            push_failed=push_failed[:20],
-            status=503,
-        )
     try:
         result = backup_v6_store.commit_set(set_id, manifest, uid)
     except ValueError as e:
@@ -354,12 +342,7 @@ async def batch_check(request: Request):
         except Exception:
             mtime = 0
         cleaned.append({"path": path, "size": size, "mtime": mtime})
-    # batch_check 现含 blob 可用性校验（本地缺失时有一次 Hub 清单网络往返），
-    # 必须放 to_thread，否则阻塞事件循环
-    try:
-        result = await asyncio.to_thread(backup_v6_store.batch_check, uid, cleaned)
-    except Exception as e:
-        raise _err("batch_check_failed", str(e), status=500)
     return ok_with_cors(result)

             "blob_missing", "manifest 引用了未上传的 blob",
             missing_keys=still_missing[:20],
         )
     try:
         result = backup_v6_store.commit_set(set_id, manifest, uid)
     except ValueError as e:
         except Exception:
             mtime = 0
         cleaned.append({"path": path, "size": size, "mtime": mtime})
+    result = backup_v6_store.batch_check(uid, cleaned)
     return ok_with_cors(result)

app/database.py CHANGED Viewed

@@ -365,23 +365,10 @@ def _create_schema(conn: sqlite3.Connection) -> None:
             device          TEXT
         );
         CREATE INDEX IF NOT EXISTS idx_backup_v6_sets_user ON backup_v6_sets(user_id, created_at DESC);
-        -- 日志查询 API Key（供外部凭 key 调用 /api/logs 查询请求日志，可吊销）
-        CREATE TABLE IF NOT EXISTS log_api_keys (
-            key          TEXT PRIMARY KEY,
-            name         TEXT,
-            created_at   INTEGER NOT NULL,
-            revoked_at   INTEGER NOT NULL DEFAULT 0,
-            last_used_at INTEGER NOT NULL DEFAULT 0
-        );
         """
     )
     # 兼容已存在的库：若旧表无 device_id 列则补加（ALTER TABLE 幂等检查）
     _ensure_column(conn, "request_log", "device_id", "TEXT")
-    # v6 备份 blob 增加 hub_ok 标记：1 = 已确认推送到 HF Hub。
-    # 修复 blob 静默丢失：此前 fire-and-forget 推送失败无感知，Space 重启后
-    # 本地盘被清空导致 blob 永久丢失（manifest 还在但内容没了）。
-    _ensure_column(conn, "backup_v6_blobs", "hub_ok", "INTEGER NOT NULL DEFAULT 0")
     # file_meta 增加 alias 列：原始文件名（可能是中文），filename 改存随机英文名
     _ensure_column(conn, "file_meta", "alias", "TEXT")
     # user_tokens 增加 revoked_at 列：token rotation 宽限期支持

             device          TEXT
         );
         CREATE INDEX IF NOT EXISTS idx_backup_v6_sets_user ON backup_v6_sets(user_id, created_at DESC);
         """
     )
     # 兼容已存在的库：若旧表无 device_id 列则补加（ALTER TABLE 幂等检查）
     _ensure_column(conn, "request_log", "device_id", "TEXT")
     # file_meta 增加 alias 列：原始文件名（可能是中文），filename 改存随机英文名
     _ensure_column(conn, "file_meta", "alias", "TEXT")
     # user_tokens 增加 revoked_at 列：token rotation 宽限期支持

app/main.py CHANGED Viewed

@@ -261,7 +261,6 @@ def create_app() -> FastAPI:
         admin_data,
         health,
         image_fix,
-        log_query,
         logs,
         music,
         music_records,
@@ -293,7 +292,6 @@ def create_app() -> FastAPI:
     app.include_router(usage_audit.router)
     app.include_router(webhooks.router)
     app.include_router(request_logs.router)
-    app.include_router(log_query.router)
     app.include_router(admin_html_router)
     app.include_router(user_html_router)
     app.include_router(user_files.router)

         admin_data,
         health,
         image_fix,
         logs,
         music,
         music_records,
     app.include_router(usage_audit.router)
     app.include_router(webhooks.router)
     app.include_router(request_logs.router)
     app.include_router(admin_html_router)
     app.include_router(user_html_router)
     app.include_router(user_files.router)

app/services/backup_v6_store.py CHANGED Viewed

@@ -120,15 +120,6 @@ def store_blob(content: bytes, mime: str) -> dict:
                 try:
                     p.parent.mkdir(parents=True, exist_ok=True)
                     p.write_bytes(content)
-                    # 本地曾丢失 → hub_ok 状态不可信，重置为 0，
-                    # 由后台推送 / commit 前的 ensure_blobs_on_hub 重新确认
-                    try:
-                        with get_conn() as conn:
-                            conn.execute(
-                                "UPDATE backup_v6_blobs SET hub_ok = 0 WHERE key = ?", (key,)
-                            )
-                    except Exception:
-                        pass
                     if is_hub_enabled():
                         asyncio.ensure_future(_push_blob_to_hub(key))
                 except Exception as e:
@@ -151,111 +142,16 @@ def store_blob(content: bytes, mime: str) -> dict:
     return {"key": key, "size": size, "exists": False}
-async def _push_blob_to_hub(key: str) -> bool:
-    """推送 blob 到 Hub（带重试 + 指数退避）。成功返回 True 并置 hub_ok=1。
-    v6 实际运行踩坑：fire-and-forget 单次推送失败即静默丢失，Space 重启后
-    本地盘清空 → blob 永久丢失（manifest 还在，内容没了，恢复 404）。
-    """
     p = _blob_local_path(key)
     if not p.exists():
-        return False
-    sub_key = f"{key[:2]}/{key}"
     try:
-        data = p.read_bytes()
     except Exception as e:
-        logger.warning("[v6_blob] read local file failed key=%s: %s", key[:8], e)
-        return False
-    max_retries = 3
-    for attempt in range(max_retries):
-        try:
-            upload_bytes(NS_BLOBS, sub_key, data)
-            ok = await push_to_hub(NS_BLOBS, sub_key)
-            if ok:
-                try:
-                    with get_conn() as conn:
-                        conn.execute(
-                            "UPDATE backup_v6_blobs SET hub_ok = 1 WHERE key = ?", (key,)
-                        )
-                except Exception as e:
-                    logger.warning("[v6_blob] mark hub_ok failed key=%s: %s", key[:8], e)
-                return True
-            # push_to_hub 内部已捕获异常返回 False，走重试
-            logger.warning(
-                "[v6_blob] push to hub returned false (attempt %d/%d) key=%s",
-                attempt + 1, max_retries, key[:8],
-            )
-        except Exception as e:
-            logger.warning(
-                "[v6_blob] push to hub failed (attempt %d/%d) key=%s: %s",
-                attempt + 1, max_retries, key[:8], e,
-            )
-        if attempt < max_retries - 1:
-            await asyncio.sleep(2 ** attempt)  # 1s / 2s 指数退避
-    logger.error("[v6_blob] push to hub FAILED after %d retries key=%s", max_retries, key[:8])
-    return False
-async def ensure_blobs_on_hub(keys: list[str], concurrency: int = 4) -> list[str]:
-    """确保 blob 已落到 Hub（按 hub_ok 标记）。
-    commit 前调用，堵住"manifest 提交成功但 blob 没上 Hub"的静默丢失漏洞：
-    - hub_ok=1 的跳过
-    - 本地有文件：并发推送（带重试），成功置 hub_ok=1
-    - 本地没文件：查 Hub 清单确认，已在 Hub 的直接置 hub_ok=1（Space 重建场景，
-      避免对已在 Hub 的 blob 做冗余重传）
-    返回仍失败的 key 列表（调用方应拒绝提交）。
-    """
-    uniq = [k for k in dict.fromkeys(keys) if k]
-    if not uniq:
-        return []
-    # 纯本地模式（未配置 HF_TOKEN / HF_CONFIG_REPO）：降级为不做 Hub 校验，
-    # 否则所有 blob 都会被误判为推送失败、拒绝提交
-    if not is_hub_enabled():
-        return []
-    placeholders = ",".join("?" * len(uniq))
-    with get_conn() as conn:
-        rows = conn.execute(
-            f"SELECT key, hub_ok FROM backup_v6_blobs WHERE key IN ({placeholders})", uniq
-        ).fetchall()
-    need = [str(r["key"]) for r in rows if not int(r["hub_ok"] or 0)]
-    if not need:
-        return []
-    have_local = [k for k in need if _blob_local_path(k).exists()]
-    no_local = [k for k in need if k not in set(have_local)]
-    confirmed: list[str] = []
-    if no_local and is_hub_enabled():
-        try:
-            hub_set = set(await asyncio.to_thread(list_hub_keys, NS_BLOBS))
-            confirmed = [k for k in no_local if k in hub_set]
-        except Exception as e:
-            logger.warning("[v6_blob] list hub keys failed: %s", e)
-    if confirmed:
-        try:
-            with get_conn() as conn:
-                for k in confirmed:
-                    conn.execute(
-                        "UPDATE backup_v6_blobs SET hub_ok = 1 WHERE key = ?", (k,)
-                    )
-        except Exception as e:
-            logger.warning("[v6_blob] mark confirmed hub_ok failed: %s", e)
-    failed: list[str] = []
-    if have_local:
-        sem = asyncio.Semaphore(max(1, concurrency))
-        async def _one(k: str) -> None:
-            async with sem:
-                ok = await _push_blob_to_hub(k)
-                if not ok:
-                    failed.append(k)
-        await asyncio.gather(*[_one(k) for k in have_local])
-    # 本地与 Hub 都没有的也返回（调用方按 blob_missing 处理）
-    lost = [k for k in no_local if k not in set(confirmed)]
-    return failed + lost
 def get_blob_local_path(key: str) -> Optional[Path]:
@@ -269,14 +165,6 @@ def get_blob_local_path(key: str) -> Optional[Path]:
             try:
                 p.parent.mkdir(parents=True, exist_ok=True)
                 p.write_bytes(data)
-                # 从 Hub 成功拉回 = Hub 上确实有，标记 hub_ok
-                try:
-                    with get_conn() as conn:
-                        conn.execute(
-                            "UPDATE backup_v6_blobs SET hub_ok = 1 WHERE key = ?", (key,)
-                        )
-                except Exception:
-                    pass
                 return p
             except Exception as e:
                 logger.warning("[v6_blob] fetch from hub failed key=%s: %s", key[:8], e)
@@ -752,48 +640,9 @@ def batch_check(user_id: str, paths: list[dict]) -> dict:
             hits.append({"path": path, "key": prev["key"], "size": size, "mtime": mtime})
         else:
             misses.append({"path": path})
-    # ★ 可用性过滤：命中但 blob 内容已丢失（本地 + Hub 都没有）的降级为 miss，
-    # 让客户端重传。否则客户端跳过这些文件 → commit 时 blob_missing。
-    # （v6 实际故障：Hub 推送静默失败 + Space 重启清盘 → manifest 还在、内容没了）
-    if hits:
-        lost_keys = set(_unavailable_blob_keys([h["key"] for h in hits]))
-        if lost_keys:
-            kept = []
-            for h in hits:
-                if h["key"] in lost_keys:
-                    logger.warning(
-                        "[v6_batch_check] blob content lost, downgrade to miss "
-                        "key=%s path=%s", h["key"][:8], h["path"],
-                    )
-                    misses.append({"path": h["path"]})
-                else:
-                    kept.append(h)
-            hits = kept
     return {"hits": hits, "misses": misses}
-def _unavailable_blob_keys(keys: list[str]) -> list[str]:
-    """返回本地与 Hub 都没有内容的 key 列表（含一次 Hub 清单往返，调用方放 to_thread）。
-    Hub 清单列举失败时返回空列表（宁可信其有，避免误判引发全量重传）。
-    """
-    uniq = [k for k in dict.fromkeys(keys) if k]
-    if not uniq:
-        return []
-    missing_local = [k for k in uniq if not _blob_local_path(k).exists()]
-    if not missing_local:
-        return []
-    if not is_hub_enabled():
-        return missing_local
-    try:
-        hub_keys = set(list_hub_keys(NS_BLOBS))
-    except Exception as e:
-        logger.warning("[v6_batch_check] list hub keys failed: %s", e)
-        return []
-    return [k for k in missing_local if k not in hub_keys]
 # ===== ZIP 分卷打包 =====
 def _volume_count(total_size: int) -> int:
@@ -1247,3 +1096,56 @@ def purge_legacy_v5(user_id: Optional[str] = None) -> dict:
         deleted_blobs = -1  # 全局模式下不精确统计
     return {"deletedSets": deleted_sets, "deletedBlobs": deleted_blobs, "freedBytes": freed_bytes}

                 try:
                     p.parent.mkdir(parents=True, exist_ok=True)
                     p.write_bytes(content)
                     if is_hub_enabled():
                         asyncio.ensure_future(_push_blob_to_hub(key))
                 except Exception as e:
     return {"key": key, "size": size, "exists": False}
+async def _push_blob_to_hub(key: str) -> None:
     p = _blob_local_path(key)
     if not p.exists():
+        return
     try:
+        sub_key = f"{key[:2]}/{key}"
+        upload_bytes(NS_BLOBS, sub_key, p.read_bytes())
+        await push_to_hub(NS_BLOBS, sub_key)
     except Exception as e:
+        logger.warning("[v6_blob] push to hub failed key=%s: %s", key[:8], e)
 def get_blob_local_path(key: str) -> Optional[Path]:
             try:
                 p.parent.mkdir(parents=True, exist_ok=True)
                 p.write_bytes(data)
                 return p
             except Exception as e:
                 logger.warning("[v6_blob] fetch from hub failed key=%s: %s", key[:8], e)
             hits.append({"path": path, "key": prev["key"], "size": size, "mtime": mtime})
         else:
             misses.append({"path": path})
     return {"hits": hits, "misses": misses}
 # ===== ZIP 分卷打包 =====
 def _volume_count(total_size: int) -> int:
         deleted_blobs = -1  # 全局模式下不精确统计
     return {"deletedSets": deleted_sets, "deletedBlobs": deleted_blobs, "freedBytes": freed_bytes}
+def purge_all_v6() -> dict:
+    """清空全部 v6 备份数据（所有用户）。
+    用于管理面板"一键清空 v6 备份"：删除所有用户的备份点与 blob
+    （DB + 本地文件 + Hub 命名空间），并清空内存中的待提交备份点 / 分片上传缓冲。
+    清空后各用户已同步的备份点全部作废，客户端下次备份将判定为"非增量"，
+    强制生成全新全量备份，用以修复"v6 备份集因同步问题损坏"的场景。
+    ★ 本函数会在工作线程（asyncio.to_thread）中执行，只做同步 SQL + 文件/网络
+      操作，绝不调用含 asyncio.create_task / ensure_future 的函数。
+    返回 {deletedSets, deletedBlobs}。
+    """
+    # 清空内存中的待提交备份点 / 分片上传会话，避免残留污染新备份
+    _pending_sets.clear()
+    _pending_uploads.clear()
+    with get_conn() as conn:
+        s_row = conn.execute("SELECT COUNT(*) AS c FROM backup_v6_sets").fetchone()
+        b_row = conn.execute("SELECT COUNT(*) AS c FROM backup_v6_blobs").fetchone()
+        deleted_sets = int(s_row["c"]) if s_row else 0
+        deleted_blobs = int(b_row["c"]) if b_row else 0
+        conn.execute("DELETE FROM backup_v6_sets")
+        conn.execute("DELETE FROM backup_v6_blobs")
+    # 本地文件：删除整个命名空间目录树（blob 与 manifest）
+    import shutil
+    from ..hf_storage import _local_path
+    for ns in (NS_BLOBS, NS_SETS):
+        try:
+            root = _local_path(ns, "_").parent
+            if root.exists():
+                shutil.rmtree(root, ignore_errors=True)
+        except Exception as e:
+            logger.warning("[v6_purge_all] remove local ns %s failed: %s", ns, e)
+    # Hub 命名空间：删除所有对象（避免 HF Space 重建后被冷备回灌）
+    if is_hub_enabled():
+        for ns in (NS_BLOBS, NS_SETS):
+            try:
+                for sub in list_hub_keys(ns):
+                    try:
+                        delete_from_hub(ns, sub)
+                    except Exception:
+                        pass
+            except Exception as e:
+                logger.warning("[v6_purge_all] list hub ns %s failed: %s", ns, e)
+    logger.info("[v6_purge_all] purged all v6 backups: sets=%d blobs=%d",
+                deleted_sets, deleted_blobs)
+    return {"deletedSets": deleted_sets, "deletedBlobs": deleted_blobs}