Update Dockerfile

Dockerfile

@@ -37,7 +37,7 @@ RUN mkdir -p /app/data /tmp
 # Set permissions
 RUN chmod +x /app/main.py
 
-# 创建启动初始化脚本：直接用应用内部依赖库解析并将账号结构化落盘
+# 创建启动初始化脚本：使用原生的 parse_cookie 与 AccountStore 落盘
 RUN cat <<'EOF' > /app/entrypoint.sh
 #!/bin/bash
 set -e
@@ -47,8 +47,14 @@ echo "[Startup] Checking for ACCOUNT* secrets..."
 python3 - <<'PYEOF'
 import os
 import re
-import json
-import uuid
+import sys
+
+try:
+    from aistudio_api.infrastructure.account.account_store import AccountStore
+    from aistudio_api.infrastructure.account.cookie_parser import parse_cookie
+except Exception as e:
+    print(f"[Startup Error] Import failed: {e}")
+    sys.exit(0)
 
 acc_pattern = re.compile(r'^ACCOUNT\d+$', re.IGNORECASE)
 account_vars = [k for k in os.environ.keys() if acc_pattern.match(k)]
@@ -58,58 +64,45 @@ if not account_vars:
     print("[Startup] No ACCOUNT* secrets found.")
 else:
     print(f"[Startup] Found {len(account_vars)} secret(s): {', '.join(account_vars)}")
-    accounts_list = []
-    
+    store = AccountStore()
+    first_account = None
+
     for idx, var_name in enumerate(account_vars, start=1):
-        raw_val = os.environ.get(var_name, "").strip()
-        if not raw_val:
+        raw_cookie = os.environ.get(var_name, "").strip()
+        if not raw_cookie:
             continue
+        try:
+            print(f"[Startup] Parsing {var_name}...")
+            # 使用项目原生的解析函数提取 Google 安全字段
+            account = parse_cookie(raw_cookie)
+            if hasattr(account, "name"):
+                account.name = f"Account-{idx}"
             
-        cookie_dict = {}
-        # 1. 如果提供的是 JSON 数组格式（如 Cookie-Editor 导出的列表）
-        if raw_val.startswith("[") and raw_val.endswith("]"):
-            try:
-                items = json.loads(raw_val)
-                for item in items:
-                    if isinstance(item, dict) and "name" in item and "value" in item:
-                        cookie_dict[item["name"]] = item["value"]
-            except Exception as e:
-                print(f"[Startup Warn] Failed to parse {var_name} as JSON list: {e}")
-
-        # 2. 如果提供的是 Header 格式字符串（或未成功解析为 dict）
-        if not cookie_dict:
-            for part in raw_val.split(";"):
-                if "=" in part:
-                    k, v = part.strip().split("=", 1)
-                    cookie_dict[k.strip()] = v.strip()
-
-        if not cookie_dict:
-            print(f"[Startup Warn] No valid cookies found in {var_name}")
-            continue
-
-        account_id = f"acc-{uuid.uuid4().hex[:8]}"
-        account_name = f"Account-{idx}"
-        
-        # 组装符合系统 AccountModel 约定的字典结构
-        account_obj = {
-            "id": account_id,
-            "name": account_name,
-            "cookies": cookie_dict,
-            "is_active": True,
-            "created_at": 1789320000.0,
-            "updated_at": 1789320000.0
-        }
-        accounts_list.append(account_obj)
-        print(f"[Startup] Prepared {var_name} as '{account_name}' ({len(cookie_dict)} cookie entries)")
-
-    if accounts_list:
-        os.makedirs("/app/data", exist_ok=True)
-        target_file = "/app/data/accounts.json"
-        
-        # 写入 accounts.json
-        with open(target_file, "w", encoding="utf-8") as f:
-            json.dump(accounts_list, f, ensure_ascii=False, indent=2)
-        print(f"[Startup] Successfully wrote {len(accounts_list)} account(s) to {target_file}")
+            # 使用项目原生的 store 方法持久化账号
+            store.save(account)
+            print(f"[Startup] Successfully saved {var_name} as '{account.name}' (ID: {account.id})")
+            
+            if first_account is None:
+                first_account = account
+        except Exception as e:
+            print(f"[Startup Error] Failed to parse/save {var_name}: {e}")
+
+    # 将第一个账号设置为活跃账号，避免 /accounts/active 返回 404
+    if first_account is not None:
+        try:
+            if hasattr(store, "set_active"):
+                store.set_active(first_account.id)
+            elif hasattr(store, "set_active_id"):
+                store.set_active_id(first_account.id)
+            print(f"[Startup] Set active account to: {first_account.id}")
+        except Exception as e:
+            print(f"[Startup Note] Setting active account: {e}")
+
+    try:
+        loaded = store.list_all() if hasattr(store, "list_all") else store.list()
+        print(f"[Startup] Confirmed loaded accounts in store: {len(loaded)}")
+    except Exception:
+        pass
 PYEOF
 
 exec "$@"