chore: v0.1.6 UI优化 - 两列网格布局、暗色适配、系统配置浮窗保存、退出登录统一到侧边栏

2026-05-15 23:08:33 +08:00
parent 4b437c34c6
commit 301bb63ef0
19 changed files with 2537 additions and 801 deletions
--- a/packages/backend/package-lock.json
+++ b/packages/backend/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "cloudsearch-backend",
-  "version": "2.0.9",
+  "version": "0.1.3",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "cloudsearch-backend",
-      "version": "2.0.9",
+      "version": "0.1.3",
      "dependencies": {
        "bcryptjs": "^2.4.3",
        "better-sqlite3": "^11.0.0",
@@ -22,6 +22,7 @@
        "multer": "^1.4.5-lts.1",
        "playwright": "^1.52.0",
        "sharp": "^0.33.0",
+        "socks-proxy-agent": "^9.0.0",
        "uuid": "^10.0.0"
      },
      "devDependencies": {
@@ -2396,6 +2397,14 @@
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
    },
+    "node_modules/ip-address": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz",
+      "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
    "node_modules/ipaddr.js": {
      "version": "1.9.1",
      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
@@ -3306,6 +3315,70 @@
        "is-arrayish": "^0.3.1"
      }
    },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.9.tgz",
+      "integrity": "sha512-LJhUYUvItdQ0LkJTmPeaEObWXAqFyfmP85x0tch/ez9cahmhlBBLbIqDFnvBnUJGagb0JbIQrkBs1wJ+yRYpEw==",
+      "dependencies": {
+        "ip-address": "^10.1.1",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-9.0.0.tgz",
+      "integrity": "sha512-fFlbMlfsXhK02ZB8aZY7Hwxh/IHBV9b1Oq9bvBk6tkFWXvdAxUgA0wbw/NYR5liU3Y5+KI6U4FH3kYJt9QYv0w==",
+      "dependencies": {
+        "agent-base": "8.0.0",
+        "debug": "^4.3.4",
+        "socks": "^2.8.3"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/socks-proxy-agent/node_modules/agent-base": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-8.0.0.tgz",
+      "integrity": "sha512-QT8i0hCz6C/KQ+KTAbSNwCHDGdmUJl2tp2ZpNlGSWCfhUNVbYG2WLE3MdZGBAgXPV4GAvjGMxo+C1hroyxmZEg==",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/socks-proxy-agent/node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socks-proxy-agent/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
    "node_modules/source-map-js": {
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "cloudsearch-backend",
-  "version": "0.0.3",
+  "version": "0.1.6",
  "private": true,
  "scripts": {
    "dev": "tsx watch src/main.ts",
--- a/packages/backend/src/cloud/baidu.driver.ts
+++ b/packages/backend/src/cloud/baidu.driver.ts
--- a/packages/backend/src/cloud/cleanup.service.ts
+++ b/packages/backend/src/cloud/cleanup.service.ts
@@ -19,7 +19,7 @@ interface CleanupOpResult { trashed: number; errors: string[] }

 interface CloudCleanupDriver {
  /** Trash date folders (YYYY-MM-DD) older than `days`. */
-  cleanupOldDateFolders(days: number): Promise<CleanupOpResult>;
+  cleanupOldDateFolders(days: number, whitelistDirs?: string[]): Promise<CleanupOpResult>;
  /**
   * If used space exceeds thresholdPercent% of TOTAL capacity,
   * delete oldest date folders until totalBytes * deletePercent/100
@@ -27,7 +27,7 @@ interface CloudCleanupDriver {
   * @param thresholdPercent — trigger when usage >= this % of total
   * @param deletePercent   — free this % of total capacity
   */
-  cleanupBySpaceThreshold(thresholdPercent: number, deletePercent: number): Promise<CleanupOpResult>;
+  cleanupBySpaceThreshold(thresholdPercent: number, deletePercent: number, whitelistDirs?: string[]): Promise<CleanupOpResult>;
  /** Permanently empty the recycle bin. */
  emptyTrash(): Promise<boolean>;
 }
@@ -62,6 +62,18 @@ interface CleanupStats {
  errors: string[];
 }

+/** Read whitelist dirs from system_configs (cleanup_whitelist_dirs). */
+export function getWhitelistDirs(): string[] {
+  const raw = getSystemConfig('cleanup_whitelist_dirs');
+  if (!raw) return [];
+  try {
+    const parsed = JSON.parse(raw);
+    return Array.isArray(parsed) ? parsed.filter((d: any) => typeof d === 'string') : [];
+  } catch {
+    return [];
+  }
+}
+
 /** Get all active cloud configs (any type). Used by the orchestrator. */
 function getActiveCleanupConfigs(): Array<{ id: number; cloud_type: string; cookie: string; nickname?: string }> {
  const db = getDb();
@@ -77,6 +89,7 @@ function getActiveCleanupConfigs(): Array<{ id: number; cloud_type: string; cook
 */
 async function cleanupCloudFiles(days: number): Promise<CleanupOpResult> {
  const configs = getActiveCleanupConfigs();
+  const whitelistDirs = getWhitelistDirs();
  const errors: string[] = [];
  let totalTrashed = 0;

@@ -87,7 +100,7 @@ async function cleanupCloudFiles(days: number): Promise<CleanupOpResult> {
      continue;
    }
    try {
-      const result = await driver.cleanupOldDateFolders(days);
+      const result = await driver.cleanupOldDateFolders(days, whitelistDirs);
      totalTrashed += result.trashed;
      errors.push(...result.errors.map(e => `[${cfg.cloud_type}#${cfg.id}] ${e}`));
    } catch (err: any) {
@@ -108,6 +121,7 @@ async function cleanupAllBySpaceThreshold(
  deletePercent: number,
 ): Promise<CleanupOpResult> {
  const configs = getActiveCleanupConfigs();
+  const whitelistDirs = getWhitelistDirs();
  const errors: string[] = [];
  let totalTrashed = 0;

@@ -118,7 +132,7 @@ async function cleanupAllBySpaceThreshold(
      continue;
    }
    try {
-      const result = await driver.cleanupBySpaceThreshold(thresholdPercent, deletePercent);
+      const result = await driver.cleanupBySpaceThreshold(thresholdPercent, deletePercent, whitelistDirs);
      totalTrashed += result.trashed;
      errors.push(...result.errors.map(e => `[${cfg.cloud_type}#${cfg.id}] ${e}`));
    } catch (err: any) {
--- a/packages/backend/src/cloud/cloud.service.ts
+++ b/packages/backend/src/cloud/cloud.service.ts
@@ -322,31 +322,86 @@ export function cleanupOldSaveRecords(): void {
 // ── Storage Refresh ───────────────────────────────────────────────

 export async function refreshAllStorageInfo(): Promise<void> {
-  const configs = getActiveCloudConfigs().filter(c => c.cloud_type === 'quark' && c.cookie);
+  const configs = getActiveCloudConfigs().filter(c => c.cookie);
  if (configs.length === 0) return;

+  const verifyCookies = getSystemConfig('cleanup_verify_enabled') === 'true';
+
  for (const cfg of configs) {
    try {
-      const { QuarkDriver } = require('./drivers/quark.driver');
-      const driver = new QuarkDriver({ cookie: decrypt(cfg.cookie!), nickname: cfg.nickname });
-      const storage = await driver.getStorageInfo(
-        decrypt(cfg.cookie!),
-        (fullUsed: string, total: string) => {
-          const db = getDb();
-          db.prepare(
-            `UPDATE cloud_configs SET storage_used = ?, storage_total = ? WHERE id = ?`
-          ).run(fullUsed, total, cfg.id);
-          console.log(`[Storage] Background calibration done for quark#${cfg.id}: ${fullUsed} / ${total}`);
+      const db = getDb();
+      const decryptedCookie = decrypt(cfg.cookie!);
+
+      switch (cfg.cloud_type) {
+        case 'quark': {
+          const driver = new QuarkDriver({ cookie: decryptedCookie, nickname: cfg.nickname });
+
+          // Get storage info (includes background calibration callback)
+          const storage = await driver.getStorageInfo(
+            (fullUsed: string, total: string) => {
+              const dbInner = getDb();
+              dbInner.prepare(
+                `UPDATE cloud_configs SET storage_used = ?, storage_total = ? WHERE id = ?`
+              ).run(fullUsed, total, cfg.id);
+              console.log(`[Storage] Background calibration done for quark#${cfg.id}: ${fullUsed} / ${total}`);
+            }
+          );
+          if (storage.totalBytes > 0 || storage.usedBytes > 0) {
+            db.prepare(
+              `UPDATE cloud_configs SET storage_used = ?, storage_total = ? WHERE id = ?`
+            ).run(storage.used, storage.total, cfg.id);
+            console.log(`[Storage] Updated quark#${cfg.id}: ${storage.used} / ${storage.total}`);
+          }
+
+          // Cookie verification
+          if (verifyCookies) {
+            const valid = await driver.validate();
+            db.prepare(
+              `UPDATE cloud_configs SET verification_status = ?, updated_at = ? WHERE id = ?`
+            ).run(valid ? 'valid' : 'invalid', localTimestamp(), cfg.id);
+            console.log(`[Storage] Verification for quark#${cfg.id}: ${valid ? 'valid' : 'invalid'}`);
+          }
+          break;
        }
-      );
-      if (storage.totalBytes > 0 || storage.usedBytes > 0) {
-        const db = getDb();
-        db.prepare(
-          `UPDATE cloud_configs SET storage_used = ?, storage_total = ? WHERE id = ?`
-        ).run(storage.used, storage.total, cfg.id);
+
+        case 'baidu': {
+          const driver = new BaiduDriver({ cookie: decryptedCookie, nickname: cfg.nickname });
+
+          // Get storage info
+          const storage = await driver.getStorageInfo();
+          if (storage.used !== '0 B' && storage.total !== '0 B') {
+            db.prepare(
+              `UPDATE cloud_configs SET storage_used = ?, storage_total = ? WHERE id = ?`
+            ).run(storage.used, storage.total, cfg.id);
+            console.log(`[Storage] Updated baidu#${cfg.id}: ${storage.used} / ${storage.total}`);
+          }
+
+          // Cookie verification
+          if (verifyCookies) {
+            const valid = await driver.validate();
+            db.prepare(
+              `UPDATE cloud_configs SET verification_status = ?, updated_at = ? WHERE id = ?`
+            ).run(valid ? 'valid' : 'invalid', localTimestamp(), cfg.id);
+            console.log(`[Storage] Verification for baidu#${cfg.id}: ${valid ? 'valid' : 'invalid'}`);
+          }
+          break;
+        }
+
+        default:
+          console.log(`[Storage] Skipping ${cfg.cloud_type}#${cfg.id} — unsupported cloud type for storage refresh`);
+          break;
      }
    } catch (err: any) {
-      console.error(`[Storage] Failed to refresh quark#${cfg.id}:`, err.message);
+      console.error(`[Storage] Failed to refresh ${cfg.cloud_type}#${cfg.id}:`, err.message);
+      // On error, mark as invalid if verification is enabled
+      if (verifyCookies) {
+        try {
+          const db = getDb();
+          db.prepare(
+            `UPDATE cloud_configs SET verification_status = 'invalid', updated_at = ? WHERE id = ?`
+          ).run(localTimestamp(), cfg.id);
+        } catch {}
+      }
    }
  }
 }
--- a/packages/backend/src/cloud/database.ts
+++ b/packages/backend/src/cloud/database.ts
@@ -306,6 +306,11 @@ function seedSystemConfigs(db: Database.Database): void {
    { key: 'cleanup_space_threshold_percent', value: '90', description: '空间使用阈值百分比（超过此值时触发强制清理）' },
    { key: 'cleanup_space_threshold_delete_percent', value: '10', description: '触发阈值清理时释放总空间的百分比（如 10 表示累计删除最旧文件直到达到总空间的 10%，6TB 总空间 → 释放 ~600GB）' },
    { key: 'save_reuse_enabled', value: 'true', description: '启用分享链接复用（相同原始链接不再重复转存，直接复用之前的分享链接）' },
+    { key: 'cleanup_whitelist_dirs', value: '[]', description: '清理白名单目录名称列表（JSON数组），这些目录不会被自动清理' },
+    { key: 'storage_refresh_interval', value: '60', description: '存储空间刷新间隔（分钟），0=不自动刷新' },
+    { key: 'cleanup_auto_refresh_storage', value: 'true', description: '启用自动刷新存储空间信息' },
+    { key: 'cleanup_verify_enabled', value: 'true', description: '定期验证网盘 Cookie 有效性（随存储刷新一起执行）' },
+    { key: 'cleanup_verify_interval', value: '30', description: 'Cookie 有效性检测间隔（分钟）' },
    { key: 'cleanup_last_run', value: '', description: '上次自动清理时间' },
    { key: 'cleanup_last_stats', value: '', description: '上次清理结果统计（JSON）' },
  ];
--- a/packages/backend/src/cloud/drivers/quark-cleanup.ts
+++ b/packages/backend/src/cloud/drivers/quark-cleanup.ts
@@ -38,15 +38,33 @@ export async function getStorageInfoQuick(cookie: string, fallbackTotal?: string
      }
    }

-    // Quick used-space estimate: sum root-level file sizes + subdir sizes
+    // Accurate used space via /member API (1 call, no full traversal needed)
+    // Ref: pan.quark.cn/1/clouddrive/member returns use_capacity + total_capacity
    let usedBytes = 0;
    try {
-      const rootFiles = await listRootDir(cookie);
-      for (const f of rootFiles) {
-        usedBytes += f.size || 0;
+      const memberParams = new URLSearchParams({ pr: 'ucpro', fr: 'pc', uc_param_str: '', __t: String(Date.now()), __dt: '1000' });
+      const memberResp = await fetch(`https://pan.quark.cn/1/clouddrive/member?${memberParams.toString()}`, {
+        headers: getHeaders(cookie),
+        signal: AbortSignal.timeout(10000),
+      });
+      if (memberResp.ok) {
+        const memberData = await memberResp.json() as any;
+        if (memberData.status === 200 && memberData.data?.use_capacity != null) {
+          usedBytes = memberData.data.use_capacity;
+        }
      }
    } catch {}

+    // Fallback: sum root-level file sizes (夸克 folders return size=0)
+    if (usedBytes === 0) {
+      try {
+        const rootFiles = await listRootDir(cookie);
+        for (const f of rootFiles) {
+          usedBytes += f.size || 0;
+        }
+      } catch {}
+    }
+
    // Cache the result (3h window)
    const currentHourBlock = Math.floor(new Date().getHours() / 3);
    storageCache.bytes = usedBytes;
@@ -231,7 +249,7 @@ export async function emptyTrash(cookie: string): Promise<boolean> {
 /**
 * Cleanup: trash date-named folders (YYYY-MM-DD) older than `days`.
 */
-export async function cleanupOldDateFolders(cookie: string, days: number): Promise<{ trashed: number; errors: string[] }> {
+export async function cleanupOldDateFolders(cookie: string, days: number, whitelistDirs?: string[]): Promise<{ trashed: number; errors: string[] }> {
  const errors: string[] = [];
  const cutoff = new Date();
  cutoff.setDate(cutoff.getDate() - days);
@@ -242,6 +260,7 @@ export async function cleanupOldDateFolders(cookie: string, days: number): Promi
    const oldFolders = rootItems.filter(item => {
      if (!item.dir) return false;
      if (!/^\d{4}-\d{2}-\d{2}$/.test(item.file_name)) return false;
+      if (whitelistDirs && whitelistDirs.includes(item.file_name)) return false;
      return item.file_name < cutoffStr;
    });

@@ -270,6 +289,7 @@ export async function cleanupBySpaceThreshold(
  cookie: string,
  thresholdPercent: number,
  deletePercent: number,
+  whitelistDirs?: string[],
 ): Promise<{ trashed: number; errors: string[] }> {
  const errors: string[] = [];

@@ -288,6 +308,7 @@ export async function cleanupBySpaceThreshold(
    const rootItems = await listRootDir(cookie);
    const dateFolders = rootItems
      .filter(item => item.dir && /^\d{4}-\d{2}-\d{2}$/.test(item.file_name))
+      .filter(item => !whitelistDirs || !whitelistDirs.includes(item.file_name))
      .sort((a, b) => a.file_name.localeCompare(b.file_name));

    if (dateFolders.length === 0) return { trashed: 0, errors: [] };
--- a/packages/backend/src/main.ts
+++ b/packages/backend/src/main.ts
@@ -177,10 +177,20 @@ async function start(): Promise<void> {
  setInterval(() => { checkAndRunScheduledCleanup().catch(err => console.error('[Cleanup] Scheduler error:', err.message)); }, CLEANUP_INTERVAL);
  setTimeout(() => { checkAndRunScheduledCleanup().catch(err => console.error('[Cleanup] Initial check error:', err.message)); }, 30000);

-  // Storage info refresh scheduler — every 60 minutes
-  const STORAGE_REFRESH_INTERVAL = 60 * 60 * 1000;
-  setInterval(() => { refreshAllStorageInfo().catch(err => console.error('[Storage] Refresh error:', err.message)); }, STORAGE_REFRESH_INTERVAL);
-  setTimeout(() => { refreshAllStorageInfo().catch(err => console.error('[Storage] Initial refresh error:', err.message)); }, 60000);
+  // Storage info refresh scheduler — configurable via system_configs
+  const { getSystemConfig: getSysCfg } = require('./admin/system-config.service');
+  const storageRefreshEnabled = getSysCfg('cleanup_auto_refresh_storage') !== 'false';
+  const storageRefreshMin = parseInt(getSysCfg('storage_refresh_interval') || '60', 10) || 60;
+  const storageRefreshMs = storageRefreshMin * 60 * 1000;
+  const verifyCookies = getSysCfg('cleanup_verify_enabled') === 'true';
+
+  if (!storageRefreshEnabled || storageRefreshMin === 0) {
+    console.log(`[Storage] Auto-refresh disabled (enabled=${storageRefreshEnabled}, interval=${storageRefreshMin} min)`);
+  } else {
+    console.log(`[Storage] Auto-refresh every ${storageRefreshMin} minutes (verifyCookies=${verifyCookies})`);
+    setInterval(() => { refreshAllStorageInfo().catch(err => console.error('[Storage] Refresh error:', err.message)); }, storageRefreshMs);
+    setTimeout(() => { refreshAllStorageInfo().catch(err => console.error('[Storage] Initial refresh error:', err.message)); }, 60000);
+  }

  const server = app.listen(config.port, () => {
    console.log(`[Server] CloudSearch Backend running on port ${config.port} (${config.nodeEnv})`);
--- a/packages/backend/src/version.ts
+++ b/packages/backend/src/version.ts
@@ -9,4 +9,4 @@
 * 修改此文件的同时请同步更新后端 package.json 中的 version 字段。
 */

-export const APP_VERSION = "0.1.1";
+export const APP_VERSION = "0.1.6";