magpie-gemini-web 0.8.0 → 0.9.0

package/lib/usage.mjs

@@ -5,7 +5,7 @@
 import path from 'node:path';
 import { getDataDir } from './native.mjs';
 
-const EXECUTE_QUERY = 'https://gemini.google.com/_/BardChatUi/graphql/schemas/GEMINI_WEB_GRAPHQL/executeQuery';
+const geminiBase = authuser => (authuser > 0 ? `https://gemini.google.com/u/${authuser}` : 'https://gemini.google.com');
 // UsagePageQuery, and the variables the Usage page sends with it.
 const USAGE_QUERY = '2/dWbCvkVB0X16r9NPnxifeOAAqdCqMf0xeWvau9yPy7g=';
 const USAGE_VARIABLES = {
@@ -35,14 +35,26 @@ const CLIENT_HEADERS = {
   'Sec-CH-UA-Platform': '"Windows"'
 };
 
-// When an account's pools are read again. They move only while the account is used, which the
-// backend records (usedAt, see poolAccounts), or when a window starts over; use from the Gemini
-// app itself is caught by USAGE_MAX_AGE_MS. No two reads of an account are closer than
-// USAGE_MIN_GAP_MS: Magpie set to read allowances automatically asks every few minutes, far
-// more often than a person opens the Usage page. A failed read stands that long too, so a
-// cookie Google turned away isn't asked about again on every refresh.
-export const USAGE_MIN_GAP_MS = 10 * 60 * 1000;
-export const USAGE_MAX_AGE_MS = 6 * 3600 * 1000;
+// When an account's pools are read again: whenever Magpie asks, once the last reading is
+// USAGE_FRESH_MS old. Magpie keeps an account's reading a minute itself (loginUsageCache in its
+// internal/provider/login_usage.go) and dates the card by when it got it, so a reading kept here
+// any longer would show old figures as new, and a refresh would show them again (#34); use from
+// the Gemini app, the website or another device leaves no trace here to read again on. On its
+// own Magpie asks about once a minute while its Usage page or tray panel is open, whenever it
+// brings the menu bar's allowances up to date (every 3 minutes unless set otherwise) and, a
+// minute apart, while it routes requests among the accounts; it asks sooner only when it puts
+// its minute aside. USAGE_FRESH_MS takes in asks that come together, a refresh pressed twice; a
+// read under way is shared.
+// A failed read stands USAGE_RETRY_MS, so a cookie Google turned away, or an account it is
+// limiting, isn't asked about again every minute. Magpie asking again within
+// USAGE_ASKED_AGAIN_MS of the last time tries it again at once: it does that only when it put
+// its minute aside, for a card's refresh button, the Usage page or tray panel brought up or
+// refreshed, `magpie quota` or a sign-in check. Its hook doesn't tell a refresh (auth.usage is
+// given getAuth and the provider alone), so one pressed later than that tries again only when
+// pressed once more.
+export const USAGE_FRESH_MS = 30 * 1000;
+export const USAGE_RETRY_MS = 10 * 60 * 1000;
+export const USAGE_ASKED_AGAIN_MS = 60 * 1000;
 
 // The pools the Usage page shows, under the names Magpie gives the same windows elsewhere.
 const POOLS = [
@@ -64,17 +76,14 @@ async function openReadOnly(file) {
 }
 
 // poolAccounts lists the enabled accounts in the backend's pool, each with the proxy it is
-// bound to, if any, and whether that proxy is enabled (proxyEnabled), whether the pool has
-// proxies at all (pooled: disabled ones count, as they do for the backend), and when the
-// backend last used it (usedAt, Unix seconds): the later of when it last took the account for
-// a request and when it last finished one.
+// bound to, if any, and whether that proxy is enabled (proxyEnabled), and whether the pool has
+// proxies at all (pooled: disabled ones count, as they do for the backend).
 export async function poolAccounts(dataDir = getDataDir()) {
   const db = await openReadOnly(path.join(dataDir, 'gemini.db'));
   try {
-    return db.all(`SELECT a.id, a.label, a.cookie, p.url AS proxy, p.enabled AS proxyEnabled,
-        EXISTS (SELECT 1 FROM proxies) AS pooled,
-        MAX(a.last_used_at, COALESCE((SELECT MAX(r.ts) FROM requests r
-          WHERE r.ts >= a.last_used_at AND r.account_id = a.id), 0)) AS usedAt
+    const hasAuthuser = db.all('PRAGMA table_info(accounts)').some(c => c.name === 'authuser');
+    return db.all(`SELECT a.id, a.label, a.cookie, ${hasAuthuser ? 'a.authuser, ' : ''}p.url AS proxy, p.enabled AS proxyEnabled,
+        EXISTS (SELECT 1 FROM proxies) AS pooled
       FROM accounts a LEFT JOIN proxies p ON p.id = a.proxy_id
       WHERE a.status = 'enabled' ORDER BY a.id`);
   } finally {
@@ -149,56 +158,64 @@ async function geminiRequest(url, account, headers, options) {
 
 // accountUsage asks Gemini for one account's usage pools.
 export async function accountUsage(account, options = {}) {
-  const url = `${EXECUTE_QUERY}?${new URLSearchParams({ query_signature: USAGE_QUERY, variables: JSON.stringify(USAGE_VARIABLES) })}`;
+  const base = geminiBase(account.authuser);
+  const url = `${base}/_/BardChatUi/graphql/schemas/GEMINI_WEB_GRAPHQL/executeQuery?${new URLSearchParams({ query_signature: USAGE_QUERY, variables: JSON.stringify(USAGE_VARIABLES) })}`;
   return parseUsage(await geminiRequest(url, account, {
     Accept: 'application/json',
     Origin: 'https://gemini.google.com',
-    Referer: 'https://gemini.google.com/usage',
+    Referer: `${base}/usage`,
+    ...(account.authuser > 0 ? { 'X-Goog-AuthUser': String(account.authuser) } : {}),
     'Sec-Fetch-Dest': 'empty',
     'Sec-Fetch-Mode': 'cors',
     'Sec-Fetch-Site': 'same-origin'
   }, options));
 }
 
-// The last read of each account: id -> { at, read, pools }, pools once it has succeeded.
+// The last read of each account: id -> { at, read, pools, failed }, pools once it has
+// succeeded, failed once it hasn't, neither while it is under way.
 const reads = new Map();
+// When Magpie last asked for each account's usage: id -> ms.
+const asked = new Map();
 
-// due says whether the account's last read is to be made again (see USAGE_MIN_GAP_MS).
-function due(last, account, options) {
-  const now = Date.now();
-  const age = now - last.at;
-  if (age < (options.minGapMs ?? USAGE_MIN_GAP_MS)) return false;
-  if (!last.pools || age >= (options.maxAgeMs ?? USAGE_MAX_AGE_MS)) return true;
-  if ((account.usedAt ?? 0) >= Math.floor(last.at / 1000)) return true;
-  return last.pools.some(p => {
-    const at = Date.parse(p?.gxu?.windowRefreshesAt ?? '');
-    return at > last.at && at <= now;
-  });
+// due says whether the account's last read is to be made again (see USAGE_FRESH_MS); one under
+// way never is. again: Magpie asked within USAGE_ASKED_AGAIN_MS of the time before.
+function due(last, again, options) {
+  const age = Date.now() - last.at;
+  const fresh = options.freshMs ?? USAGE_FRESH_MS;
+  if (last.pools) return age >= fresh;
+  return !!last.failed && age >= (again ? fresh : (options.retryMs ?? USAGE_RETRY_MS));
 }
 
 function readUsage(account, options) {
+  const now = Date.now();
+  const again = now - asked.get(account.id) < (options.askedAgainMs ?? USAGE_ASKED_AGAIN_MS);
+  asked.set(account.id, now);
   const last = reads.get(account.id);
-  if (last && !due(last, account, options)) return last.read;
-  const entry = { at: Date.now() };
-  entry.read = accountUsage(account, options).then(u => ((entry.pools = u.pools), u));
+  if (last && !due(last, again, options)) return last.read;
+  const entry = { at: now };
+  entry.read = accountUsage(account, options).then(
+    u => ((entry.pools = u.pools), u),
+    err => { entry.failed = true; throw err; }
+  );
   reads.set(account.id, entry);
   return entry.read;
 }
 
 // The Google account's email, from the signed-in app page's bootstrap data (WIZ_global_data's
 // oPEP7c), kept per backend account: the page is large and the email doesn't change. A page
-// that didn't give it is asked for again no sooner than USAGE_MAX_AGE_MS: the email only names
+// that didn't give it is asked for again no sooner than EMAIL_RETRY_MS: the email only names
 // a card. An account with no certain way out (egress) isn't asked yet, and that isn't a try.
 const emails = new Map(); // id -> { email }, or { at } since the last try that got none
 const EMAIL_FIELD = /"oPEP7c":"([^"@\s]+@[^"\s]+)"/;
+const EMAIL_RETRY_MS = 6 * 3600 * 1000;
 
 export async function accountEmail(account, options = {}) {
   const known = emails.get(account.id);
   if (known?.email) return known.email;
-  if (known && Date.now() - known.at < (options.maxAgeMs ?? USAGE_MAX_AGE_MS)) return undefined;
+  if (known && Date.now() - known.at < (options.emailRetryMs ?? EMAIL_RETRY_MS)) return undefined;
   egress(account, options);
   emails.set(account.id, { at: Date.now() });
-  const page = await geminiRequest('https://gemini.google.com/app', account, {
+  const page = await geminiRequest(`${geminiBase(account.authuser)}/app`, account, {
     Accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
     'Sec-Fetch-Dest': 'document',
     'Sec-Fetch-Mode': 'navigate',
@@ -250,7 +267,7 @@ export function poolWindows(read) {
 // usage is the Magpie usage card: one account's 5-hour and weekly windows, as
 // gemini.google.com/usage shows them, when the sign-in names its backend account; else the
 // whole pool's, as one card. Accounts go by their Google emails (#id until that is known).
-// An account is read from Google again only when due (see USAGE_MIN_GAP_MS).
+// An account is read from Google again only when due (see USAGE_FRESH_MS).
 // Magpie hides a card's windows behind an error, so a pool account that can't be read only
 // says so in the tooltip while the others still show.
 export async function usage(options = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "magpie-gemini-web",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Gemini Web and Google AI Studio provider for Magpie, backed by gemini-web2api-go and AIStudio2API",
   "type": "module",
   "main": "./index.mjs",
@@ -83,6 +83,6 @@
   },
   "magpie": {
     "icon": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIj48ZGVmcz48bGluZWFyR3JhZGllbnQgaWQ9ImEiIHgxPSIyIiB5MT0iMyIgeDI9IjIwIiB5Mj0iMjEiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj48c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjMDZCNkQ0Ii8+PHN0b3Agb2Zmc2V0PSI1MCUiIHN0b3AtY29sb3I9IiMzQjgyRjYiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM4QjVDRjYiLz48L2xpbmVhckdyYWRpZW50PjxsaW5lYXJHcmFkaWVudCBpZD0iYiIgeDE9IjE0IiB5MT0iMiIgeDI9IjIyIiB5Mj0iMTAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj48c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjOEI1Q0Y2Ii8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjRUM0ODk5Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHBhdGggZD0iTTEwIDMuMkMxMC4zNSAzLjIgMTAuNjIgMy40NSAxMC43MiAzLjhDMTEuNDUgNi44NSAxMy4xNSA4LjU1IDE2LjIgOS4yOEMxNi41NSA5LjM4IDE2LjggOS42NSAxNi44IDEwQzE2LjggMTAuMzUgMTYuNTUgMTAuNjIgMTYuMiAxMC43MkMxMy4xNSAxMS40NSAxMS40NSAxMy4xNSAxMC43MiAxNi4yQzEwLjYyIDE2LjU1IDEwLjM1IDE2LjggMTAgMTYuOEM5LjY1IDE2LjggOS4zOCAxNi41NSA5LjI4IDE2LjJDOC41NSAxMy4xNSA2Ljg1IDExLjQ1IDMuOCAxMC43MkMzLjQ1IDEwLjYyIDMuMiAxMC4zNSAzLjIgMTBDMy4yIDkuNjUgMy40NSA5LjM4IDMuOCA5LjI4QzYuODUgOC41NSA4LjU1IDYuODUgOS4yOCAzLjhDOS4zOCAzLjQ1IDkuNjUgMy4yIDEwIDMuMloiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0wLjUgMi41KSBzY2FsZSgxLjEyKSIgZmlsbD0idXJsKCNhKSIvPjxwYXRoIGQ9Ik0xOC4yIDEuOEMxOC40MiAxLjggMTguNiAxLjk1IDE4LjY2IDIuMTZDMTkuMDggMy44MiAyMC4wMiA0Ljc2IDIxLjY4IDUuMThDMjEuODkgNS4yNCAyMi4wNCA1LjQyIDIyLjA0IDUuNjRDMjIuMDQgNS44NiAyMS44OSA2LjA0IDIxLjY4IDYuMUMyMC4wMiA2LjUyIDE5LjA4IDcuNDYgMTguNjYgOS4xMkMxOC42IDkuMzMgMTguNDIgOS40OCAxOC4yIDkuNDhDMTcuOTggOS40OCAxNy44IDkuMzMgMTcuNzQgOS4xMkMxNy4zMiA3LjQ2IDE2LjM4IDYuNTIgMTQuNzIgNi4xQzE0LjUxIDYuMDQgMTQuMzYgNS44NiAxNC4zNiA1LjY0QzE0LjM2IDUuNDIgMTQuNTEgNS4yNCAxNC43MiA1LjE4QzE2LjM4IDQuNzYgMTcuMzIgMy44MiAxNy43NCAyLjE2QzE3LjggMS45NSAxNy45OCAxLjggMTguMiAxLjhaIiBmaWxsPSJ1cmwoI2IpIi8+PGNpcmNsZSBjeD0iMTcuOCIgY3k9IjE4LjIiIHI9IjEuMzUiIGZpbGw9IiM2MzY2RjEiLz48L3N2Zz4=",
-    "maxConcurrency": 1
+    "maxConcurrency": 2
   }
 }