Spaces:

huanx
/

ds2api-browser

Running

nacho commited on 16 days ago

Commit

251d72f

1 Parent(s): a3f3a8e

feat: 面板登录密码 + 启动自动预登录账号

- 新增登录遮罩层，需输入 admin key 才能进入控制台
- admin key 验证通过 /admin/verify 接口
- localStorage 持久化密钥，下次自动登录
- 启动时自动预登录所有账号（后台异步）
- 移除面板中多余的 admin key 输入框

Files changed (2) hide show

main.py +26 -0
static/index.html +75 -18

main.py CHANGED Viewed

@@ -268,6 +268,16 @@ async def list_accounts(admin_key: str = Header(...)):
     return {"accounts": accounts, "total": len(accounts)}
 @app.get("/")
 async def admin_panel():
     return RedirectResponse(url="/static/index.html")
@@ -285,6 +295,22 @@ async def startup():
     logger.info("Loaded %d accounts", len(config.accounts))
 def main():
     import uvicorn

     return {"accounts": accounts, "total": len(accounts)}
+@app.post("/admin/verify")
+async def admin_verify(request: Request):
+    """Verify admin key for panel login."""
+    body = await request.json()
+    key = body.get("key", "")
+    if key != config.server.admin_key:
+        raise HTTPException(status_code=401, detail="Invalid admin key")
+    return {"ok": True}
 @app.get("/")
 async def admin_panel():
     return RedirectResponse(url="/static/index.html")
     logger.info("Loaded %d accounts", len(config.accounts))
+    # Pre-login all accounts in background so they show online immediately
+    asyncio.create_task(_prelogin_all())
+async def _prelogin_all():
+    """Pre-login all accounts at startup for instant readiness."""
+    for email, account in manager.accounts.items():
+        try:
+            logger.info("Pre-logging in %s...", email)
+            await manager.get_or_create_browser_with_retry(
+                account, headless=config.browser.headless
+            )
+            logger.info("Pre-login OK: %s (muted=%s)", email, account.is_muted)
+        except Exception as e:
+            logger.error("Pre-login FAILED for %s: %s", email, e)
 def main():
     import uvicorn

static/index.html CHANGED Viewed

@@ -120,10 +120,37 @@ select{cursor:pointer;appearance:none;background-image:url("data:image/svg+xml,%
 .empty{color:var(--text-muted);padding:24px 0;text-align:center;font-size:12px}
 .key-row{display:grid;grid-template-columns:1fr 1fr;gap:10px}
 @media(max-width:600px){.key-row{grid-template-columns:1fr}}
 </style>
 </head>
 <body>
 <div class="topbar">
   <span class="logo">▸ DS2API</span>
   <span class="badge-mode">浏览器模式</span>
@@ -157,15 +184,9 @@ select{cursor:pointer;appearance:none;background-image:url("data:image/svg+xml,%
         <span class="hint">/v1/chat/completions</span>
       </div>
       <div class="card-body">
-        <div class="key-row">
-          <div class="form-group">
-            <label>API Key</label>
-            <input type="password" id="apiKey" placeholder="sk-xxx">
-          </div>
-          <div class="form-group">
-            <label>Admin Key</label>
-            <input type="password" id="adminKey" placeholder="admin key">
-          </div>
         </div>
         <div class="row" style="gap:10px;margin-bottom:14px">
           <div class="form-group" style="flex:1;margin-bottom:0">
@@ -229,6 +250,7 @@ select{cursor:pointer;appearance:none;background-image:url("data:image/svg+xml,%
   </div>
 </div>
 <script>
 const H=location.origin;
@@ -237,16 +259,48 @@ const LS={
   set(k,v){try{localStorage.setItem('ds2_'+k,v)}catch(e){}}
 };
-// Restore saved keys
-document.getElementById('apiKey').value=LS.get('apiKey','');
-document.getElementById('adminKey').value=LS.get('adminKey','');
-// Auto-save keys on change
-document.getElementById('apiKey').addEventListener('input',e=>LS.set('apiKey',e.target.value));
-document.getElementById('adminKey').addEventListener('input',e=>LS.set('adminKey',e.target.value));
 function getApiKey(){return document.getElementById('apiKey').value.trim()||'sk-default'}
-function getAdminKey(){return document.getElementById('adminKey').value.trim()||'admin'}
 function toast(m,ok){
   const e=document.createElement('div');
@@ -396,8 +450,11 @@ async function loadAll(){await loadStats();await loadAccounts()}
 // Ctrl+Enter to send
 document.getElementById('prompt').addEventListener('keydown',e=>{if(e.ctrlKey&&e.key==='Enter')sendMsg()});
-loadAll();
-setInterval(loadAll,12000);
 </script>
 </body>
 </html>

 .empty{color:var(--text-muted);padding:24px 0;text-align:center;font-size:12px}
 .key-row{display:grid;grid-template-columns:1fr 1fr;gap:10px}
 @media(max-width:600px){.key-row{grid-template-columns:1fr}}
+/* ── login overlay ── */
+.login-overlay{position:fixed;inset:0;z-index:200;background:var(--bg);display:flex;align-items:center;justify-content:center;transition:opacity .4s}
+.login-overlay.hidden{opacity:0;pointer-events:none}
+.login-box{background:var(--surface);backdrop-filter:blur(16px);border:1px solid var(--border);border-radius:var(--radius);padding:40px;width:100%;max-width:380px;text-align:center;animation:fadeUp .5s ease-out}
+.login-box .logo-big{font-size:24px;font-weight:800;background:linear-gradient(135deg,var(--accent),hsl(280,80%,65%));-webkit-background-clip:text;-webkit-text-fill-color:transparent;margin-bottom:8px}
+.login-box .sub{color:var(--text-dim);font-size:12px;margin-bottom:28px}
+.login-box .form-group{text-align:left;margin-bottom:16px}
+.login-box .btn-primary{width:100%;padding:12px;font-size:14px}
+.login-box .err-msg{color:var(--red);font-size:12px;margin-top:10px;min-height:18px}
+.app-wrap{transition:filter .3s}
+.app-wrap.blur{filter:blur(8px);pointer-events:none}
 </style>
 </head>
 <body>
+<!-- Login Overlay -->
+<div class="login-overlay" id="loginOverlay">
+  <div class="login-box">
+    <div class="logo-big">▸ DS2API</div>
+    <div class="sub">输入管理密钥进入控制台</div>
+    <div class="form-group">
+      <label>Admin Key</label>
+      <input type="password" id="loginKey" placeholder="请输入管理密钥" autofocus>
+    </div>
+    <button class="btn btn-primary" onclick="doLogin()" id="loginBtn">进入控制台</button>
+    <div class="err-msg" id="loginErr"></div>
+  </div>
+</div>
+<div class="app-wrap" id="appWrap">
 <div class="topbar">
   <span class="logo">▸ DS2API</span>
   <span class="badge-mode">浏览器模式</span>
         <span class="hint">/v1/chat/completions</span>
       </div>
       <div class="card-body">
+        <div class="form-group">
+          <label>API Key</label>
+          <input type="password" id="apiKey" placeholder="sk-xxx">
         </div>
         <div class="row" style="gap:10px;margin-bottom:14px">
           <div class="form-group" style="flex:1;margin-bottom:0">
   </div>
 </div>
+</div><!-- /app-wrap -->
 <script>
 const H=location.origin;
   set(k,v){try{localStorage.setItem('ds2_'+k,v)}catch(e){}}
 };
+let _adminKey='';
+// ── Auth Gate ──
+async function doLogin(){
+  const key=document.getElementById('loginKey').value.trim();
+  const err=document.getElementById('loginErr');
+  const btn=document.getElementById('loginBtn');
+  if(!key){err.textContent='请输入密钥';return}
+  btn.disabled=true;btn.textContent='验证中…';err.textContent='';
+  try{
+    const r=await fetch(H+'/admin/verify',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({key})});
+    if(!r.ok)throw new Error('密钥错误');
+    _adminKey=key;
+    LS.set('adminKey',key);
+    document.getElementById('loginOverlay').classList.add('hidden');
+    document.getElementById('appWrap').classList.remove('blur');
+    initApp();
+  }catch(e){err.textContent=e.message}
+  btn.disabled=false;btn.textContent='进入控制台';
+}
+document.getElementById('loginKey').addEventListener('keydown',e=>{if(e.key==='Enter')doLogin()});
+// Auto-login if key saved
+(async()=>{
+  const saved=LS.get('adminKey','');
+  if(saved){
+    document.getElementById('loginKey').value=saved;
+    try{
+      const r=await fetch(H+'/admin/verify',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({key:saved})});
+      if(r.ok){_adminKey=saved;document.getElementById('loginOverlay').classList.add('hidden');document.getElementById('appWrap').classList.remove('blur');initApp();return}
+    }catch(e){}
+  }
+  document.getElementById('appWrap').classList.add('blur');
+})();
 function getApiKey(){return document.getElementById('apiKey').value.trim()||'sk-default'}
+function getAdminKey(){return _adminKey||'admin'}
+// Restore API key
+document.getElementById('apiKey').value=LS.get('apiKey','');
+document.getElementById('apiKey').addEventListener('input',e=>LS.set('apiKey',e.target.value));
 function toast(m,ok){
   const e=document.createElement('div');
 // Ctrl+Enter to send
 document.getElementById('prompt').addEventListener('keydown',e=>{if(e.ctrlKey&&e.key==='Enter')sendMsg()});
+let _pollTimer=null;
+function initApp(){
+  loadAll();
+  if(!_pollTimer)_pollTimer=setInterval(loadAll,12000);
+}
 </script>
 </body>
 </html>