Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ go run ./cmd/aistudio2api
- 文件导入:`--storage-state`
- Cookie 导入:`--cookie`、`--cookie-file` 或 `--cdp`,账户邮箱按 Cookie 识别,也可用一个 `--email` 指定;`--authuser N` 选择 Cookie 中第 N 个 Google 会话(官网 `/u/N/`)的账户并验证其邮箱;只保留 google.com 及其子域的 Cookie,缺少 `__Secure-1PSID`、`SAPISID`、`__Secure-1PAPISID` 或 `__Secure-3PAPISID` 时报告缺少的 Cookie
- `--cdp` 接受 `host:port`、HTTP 调试地址或浏览器级 `ws://` 地址,经 CDP `Storage.getCookies` 读取该浏览器的全部未分区 Cookie
- 管理页面导入 Cookie 只需粘贴 Cookie 或选择 Cookie 文件:页面在粘贴或输入停顿后自动识别,服务以 Cookie 打开 AI Studio 对话页,从页面全局数据 `oPEP7c` 读取登录账户邮箱,再读取 `ListModels` 确认可用;页面转到登录页时返回 `signed_out`
- 管理页面导入 Cookie 只需粘贴 Cookie 或选择 Cookie 文件:页面在粘贴或输入停顿后自动识别,服务以 Cookie 打开 AI Studio 对话页,从页面全局数据 `oPEP7c` 读取登录账户邮箱,再读取 `ListModels` 确认可用;页面转到登录页时返回 `signed_out`;账户池中已有的账户标为 `imported`,其中需要重新登录的另标 `sign_in_required` 并默认勾选,导入时原地更新该账户,冷却与运行状态保留
- 管理页面的添加、导入与重新登录在服务端的账户任务中运行(`internal/api/account_tasks.go`):请求返回 202 与任务后对话框即关闭,任务在请求结束后继续运行,逐个处理账户并把每个账户的状态、当前步骤、错误码与原因推送到管理事件流的 `account_tasks`,账户页据此显示任务行;浏览器登录任务带登录窗口 ID,页内登录窗口隐藏或页面刷新后以同一 ID 重新连接
- “从指纹浏览器导入”从本机进程命令行找出带 `--remote-debugging-port` 的浏览器(端口为 0 时读取用户数据目录的 `DevToolsActivePort`),逐个读取 Cookie 并识别账户,列出可导入、已导入与未登录的浏览器
- 隔离登录:`--login`
Expand Down
2 changes: 1 addition & 1 deletion docs/protocol.md
Original file line number Diff line number Diff line change
Expand Up @@ -1820,7 +1820,7 @@ GET/DELETE /v1beta/files/{file}
| `CookieAccountsInput` | `items`(每项 `email`、`cookies` 或 `cdp`、可选 `auth_user`:Cookie 中的会话序号 0–9,默认 0)、`proxy`、`locale`、`timezone` |
| `AccountTask` | `id`、`kind`(`login`、`relogin`、`chrome`、`cookies`、`browser`)、可选 `view`、`state`(`running`、`done`、`failed`)、`items`、`started_at` |
| `AccountTaskItem` | `label`(账户邮箱,浏览器登录完成前为空)、`state`(`pending`、`running`、`done`、`failed`)、可选 `step`(处理中的账户当前的步骤:`login` 等待登录、`reading` 读取浏览器里的登录状态、`checking` 检查 AI Studio 访问、`saving` 保存账户)、可选 `code`、`error` |
| `CookieBrowser` | `address`、`browser`、`email`、`auth_user`、`imported`、`signed_out`、`error`、`restricted`、`device_bound` |
| `CookieBrowser` | `address`、`browser`、`email`、`auth_user`、`imported`、`signed_out`、`error`、`restricted`、`device_bound`、`sign_in_required` |
| `PairingToken` | `token`、`expires_at` |
| `AccountStateInput` | `label`、`locale`、`timezone`、`storage_state`、可选 `auth_user`(默认 0)、可选 `fingerprint` |
| `AdminCooldown` | `account_id`、`account_label`、`model_id`、`until`、可选 `reason` |
Expand Down
2 changes: 2 additions & 0 deletions internal/api/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,8 @@ type CookieBrowser struct {

// DeviceBound 表示 Cookie 带 __Secure-1PSIDRTS,会话绑定原浏览器所在的设备,导入的副本约 2 小时内失效
DeviceBound bool `json:"device_bound"`
// SignInRequired 表示该账户已导入且需要重新登录,导入时原地更新它的认证状态
SignInRequired bool `json:"sign_in_required"`
}

// ChromeImportInput 表示批量导入的 Chrome 账号与账户环境
Expand Down
22 changes: 13 additions & 9 deletions internal/app/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ func (admin *runtimeAdmin) CookieBrowsers(ctx context.Context, proxy string) ([]
admin.requests.log("auth", "ERROR", "查找本机调试浏览器失败", "error", err)
return nil, err
}
existing := admin.accountIDs()
statuses := admin.pool.Status()
browsers := make([][]api.CookieBrowser, len(addresses))
var group sync.WaitGroup
for index, address := range addresses {
Expand All @@ -330,7 +330,7 @@ func (admin *runtimeAdmin) CookieBrowsers(ctx context.Context, proxy string) ([]
if err != nil && !browser.SignedOut {
browser.Error = err.Error()
}
browsers[index] = cookieAccountEntries(browser, accounts, existing)
browsers[index] = cookieAccountEntries(browser, accounts, statuses)
})
}
group.Wait()
Expand Down Expand Up @@ -365,27 +365,31 @@ func (admin *runtimeAdmin) DiscoverCookieAccounts(ctx context.Context, input api
admin.requests.log("auth", "ERROR", "识别 Cookie 中的账户失败", "error", err)
return nil, invalidAccount(err)
}
return cookieAccountEntries(api.CookieBrowser{DeviceBound: deviceBoundSession(state)}, accounts, admin.accountIDs()), nil
return cookieAccountEntries(api.CookieBrowser{DeviceBound: deviceBoundSession(state)}, accounts, admin.pool.Status()), nil
}

// deviceBoundSession 表示 Cookie 带 __Secure-1PSIDRTS,会话绑定签发它的设备
func deviceBoundSession(state aistudio.StorageState) bool {
return slices.ContainsFunc(state.Cookies, func(cookie aistudio.StateCookie) bool { return cookie.Name == "__Secure-1PSIDRTS" })
}

// cookieAccountEntries 以 template 为模板为每个会话账户生成一项并标记已导入与服务受限的账户,没有账户时只返回 template
func cookieAccountEntries(template api.CookieBrowser, accounts []chromeauth.CookieAccount, existing map[string]string) []api.CookieBrowser {
// cookieAccountEntries 以 template 为模板为每个会话账户生成一项,按账户池状态 statuses 标记已导入、需要重新登录与服务受限的账户,没有账户时只返回 template
func cookieAccountEntries(template api.CookieBrowser, accounts []chromeauth.CookieAccount, statuses []aistudio.AccountStatus) []api.CookieBrowser {
if len(accounts) == 0 {
return []api.CookieBrowser{template}
}
existing := make(map[string]aistudio.AccountStatus, len(statuses))
for _, status := range statuses {
existing[strings.ToLower(strings.TrimSpace(status.ID))] = status
}
entries := make([]api.CookieBrowser, len(accounts))
for index, account := range accounts {
entry := template
entry.Email, entry.AuthUser, entry.Restricted = account.Email, account.AuthUser, account.Restricted
if restricted, imported := existing[account.Email]; imported {
entry.Imported = true
if restricted != "" {
entry.Restricted = restricted
if status, imported := existing[account.Email]; imported {
entry.Imported, entry.SignInRequired = true, status.State == aistudio.AccountAuthRequired
if status.State == aistudio.AccountRestricted && status.Message != "" {
entry.Restricted = status.Message
}
}
entries[index] = entry
Expand Down
16 changes: 13 additions & 3 deletions web/src/components/AccountsPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -812,10 +812,10 @@ const importableCookieCandidates = computed(() =>
cookieCandidates.value.filter((item) => item.restricted === ''),
)

// defaultCookieUsers 是默认勾选的候选账户:有未导入账户时为未导入账户,全部已导入时为全部可导入的候选账户
// defaultCookieUsers 是默认勾选的候选账户:有未导入或需要重新登录的账户时为这些账户,否则为全部可导入的候选账户
const defaultCookieUsers = computed(() => {
const unimported = importableCookieCandidates.value
.filter((item) => !item.imported)
.filter((item) => !item.imported || item.sign_in_required)
.map(cookieKey)
return unimported.length > 0 ? unimported : importableCookieCandidates.value.map(cookieKey)
})
Expand Down Expand Up @@ -870,7 +870,7 @@ async function scanBrowsers(): Promise<void> {
.filter(
(browser) =>
browser.email !== '' &&
!browser.imported &&
(!browser.imported || browser.sign_in_required) &&
browser.error === '' &&
browser.restricted === '',
)
Expand Down Expand Up @@ -2162,6 +2162,11 @@ async function refreshAccounts(accounts: Account[]): Promise<void> {
class="mt-1 block text-xs leading-5 text-amber-200"
>{{ t('accounts.deviceBound') }}</span
>
<span
v-if="candidate.sign_in_required"
class="mt-1 block text-xs leading-5 text-gray-400"
>{{ t('accounts.signInUpdates') }}</span
>
<span
v-if="candidate.restricted"
class="mt-1 block text-xs leading-5 [overflow-wrap:anywhere] text-red-300"
Expand Down Expand Up @@ -2318,6 +2323,11 @@ async function refreshAccounts(accounts: Account[]): Promise<void> {
class="mt-1 block text-xs leading-5 text-amber-200"
>{{ t('accounts.deviceBound') }}</span
>
<span
v-if="browser.sign_in_required"
class="mt-1 block text-xs leading-5 text-gray-400"
>{{ t('accounts.signInUpdates') }}</span
>
<span
v-if="browser.restricted"
class="mt-1 block text-xs leading-5 [overflow-wrap:anywhere] text-red-300"
Expand Down
2 changes: 2 additions & 0 deletions web/src/locales/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@ export const messages: Record<TranslationKey, string> = {
'accounts.browserSignedOut': 'Nicht bei AI Studio angemeldet',
'accounts.rescan': 'Erneut suchen',
'accounts.alreadyImported': 'Importiert',
'accounts.signInUpdates':
'Anmeldung erforderlich: Beim Import werden die Cookies dieses Kontos aktualisiert, die Cooldowns der Modelle bleiben erhalten',
'accounts.remoteAddHelp': 'Auf einem anderen Computer anmelden und hierher senden',
'accounts.pasteStep1':
'Im bei AI Studio angemeldeten Browser eine Cookie-Erweiterung wie Cookie-Editor installieren',
Expand Down
2 changes: 2 additions & 0 deletions web/src/locales/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@ export const messages: Record<TranslationKey, string> = {
'accounts.browserSignedOut': 'Not signed in to AI Studio',
'accounts.rescan': 'Search again',
'accounts.alreadyImported': 'Imported',
'accounts.signInUpdates':
'Sign-in required: importing updates this account’s cookies and keeps each model’s cooldown',
'accounts.remoteAddHelp': 'Sign in on another computer and send the account here',
'accounts.pasteStep1':
'In a browser signed in to AI Studio, install a cookie extension such as Cookie-Editor',
Expand Down
2 changes: 2 additions & 0 deletions web/src/locales/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,8 @@ export const messages: Record<TranslationKey, string> = {
'accounts.browserSignedOut': 'Non connecté à AI Studio',
'accounts.rescan': 'Rechercher à nouveau',
'accounts.alreadyImported': 'Importé',
'accounts.signInUpdates':
'Connexion requise : l’importation met à jour les cookies de ce compte et conserve le refroidissement de chaque modèle',
'accounts.remoteAddHelp': 'Se connecter sur un autre ordinateur et envoyer le compte ici',
'accounts.pasteStep1':
'Dans un navigateur connecté à AI Studio, installer une extension de cookies comme Cookie-Editor',
Expand Down
2 changes: 2 additions & 0 deletions web/src/locales/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ export const messages: Record<TranslationKey, string> = {
'accounts.browserSignedOut': 'AI Studio に未ログイン',
'accounts.rescan': '再検索',
'accounts.alreadyImported': 'インポート済み',
'accounts.signInUpdates':
'ログインが必要:インポートするとこのアカウントの Cookie を更新し、各モデルのクールダウンは保持されます',
'accounts.remoteAddHelp': '別のパソコンでログインしてここへ送信',
'accounts.pasteStep1':
'AI Studio にログイン済みのブラウザに Cookie 拡張機能(Cookie-Editor など)をインストール',
Expand Down
2 changes: 2 additions & 0 deletions web/src/locales/ko.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ export const messages: Record<TranslationKey, string> = {
'accounts.browserSignedOut': 'AI Studio에 로그인되지 않음',
'accounts.rescan': '다시 찾기',
'accounts.alreadyImported': '가져옴',
'accounts.signInUpdates':
'로그인 필요: 가져오면 이 계정의 쿠키를 업데이트하고 모델별 쿨다운은 유지됩니다',
'accounts.remoteAddHelp': '다른 컴퓨터에서 로그인한 뒤 여기로 보내기',
'accounts.pasteStep1':
'AI Studio에 로그인된 브라우저에 Cookie-Editor 같은 쿠키 확장 프로그램 설치',
Expand Down
1 change: 1 addition & 0 deletions web/src/locales/zh-CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ export const messages = {
'accounts.browserSignedOut': '未登录 AI Studio',
'accounts.rescan': '重新查找',
'accounts.alreadyImported': '已导入',
'accounts.signInUpdates': '需要登录:导入后直接更新这个账户的 Cookie,各模型的冷却保留',
'accounts.remoteAddHelp': '在另一台电脑登录后发送到这里',
'accounts.pasteStep1': '在已登录 AI Studio 的浏览器中安装 Cookie 扩展,例如 Cookie-Editor',
'accounts.pasteStep2': '打开 aistudio.google.com,用扩展导出 Cookie 并粘贴到下方',
Expand Down
1 change: 1 addition & 0 deletions web/src/locales/zh-TW.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ export const messages: Record<TranslationKey, string> = {
'accounts.browserSignedOut': '未登入 AI Studio',
'accounts.rescan': '重新尋找',
'accounts.alreadyImported': '已匯入',
'accounts.signInUpdates': '需要登入:匯入後直接更新這個帳戶的 Cookie,各模型的冷卻保留',
'accounts.remoteAddHelp': '在另一台電腦登入後傳送到這裡',
'accounts.pasteStep1': '在已登入 AI Studio 的瀏覽器安裝 Cookie 擴充功能,例如 Cookie-Editor',
'accounts.pasteStep2': '開啟 aistudio.google.com,用擴充功能匯出 Cookie 並貼到下方',
Expand Down
2 changes: 2 additions & 0 deletions web/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ export interface CookieBrowser {
error: string
// restricted 是账户服务受限的原因,受限的账户不能导入
restricted: string
// sign_in_required 为真时该账户已导入且需要重新登录,导入时原地更新它的认证状态
sign_in_required: boolean
}

interface AccountCounters {
Expand Down