Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
204691772c | ||
|
|
15e3f1dd29 | ||
|
|
bcd208684b | ||
|
|
2bdbe4943d | ||
|
|
1c365a55a8 |
@@ -83,8 +83,9 @@ public partial class LoginWindow : Window
|
|||||||
const h={headers:{accept:'application/json'}};
|
const h={headers:{accept:'application/json'}};
|
||||||
const b=await(await fetch('/api/bootstrap',h)).json();
|
const b=await(await fetch('/api/bootstrap',h)).json();
|
||||||
const rawB=JSON.stringify(b).slice(0,600);
|
const rawB=JSON.stringify(b).slice(0,600);
|
||||||
let id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
|
let id=b?.account?.memberships?.[0]?.organization?.uuid
|
||||||
||b?.default_organization?.uuid||b?.account?.uuid||null;
|
||b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
|
||||||
|
||b?.default_organization?.uuid||null;
|
||||||
const e=b?.account?.email_address||b?.account?.email||b?.email||null;
|
const e=b?.account?.email_address||b?.account?.email||b?.email||null;
|
||||||
let orgSrc='bootstrap';
|
let orgSrc='bootstrap';
|
||||||
if(!id){
|
if(!id){
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
## What's new in beta.28
|
## What's new in beta.30
|
||||||
|
|
||||||
- Debug banner now appears on the main panel after sign-in showing raw bootstrap data — paste this here so we can fix org ID parsing
|
- Fix: removed WebView2 from periodic refresh — it was spawning a full Chromium process every 2 minutes and not cleaning up, causing ~1.5GB memory growth
|
||||||
- Fix: limits no longer wiped when a refresh cycle returns no data (placeholders stay until real data arrives)
|
- Fix: added Origin, Referer, sec-fetch-* and sec-ch-ua headers to HttpClient so the API accepts requests as browser fetches
|
||||||
- Try account.uuid as org ID fallback when no org found in bootstrap
|
- Periodic refresh now uses HttpClient only, falling back to data cached at login time
|
||||||
|
- To get limits showing: sign out and sign back in once so SaveAndClose can fetch usage with the corrected org ID path
|
||||||
|
|||||||
@@ -95,15 +95,13 @@ public class UsageViewModel : INotifyPropertyChanged
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try HttpClient first (fast path) — may be rejected by server CORS/header checks
|
// HttpClient refresh — WebView2 is NOT used here to avoid spawning a heavy
|
||||||
|
// browser process every refresh cycle (causes memory accumulation).
|
||||||
|
// SaveAndClose at login time is responsible for fetching live data via WebView2.
|
||||||
var (limits, overage, prepaid, email, orgId, ok) = hasCookies
|
var (limits, overage, prepaid, email, orgId, ok) = hasCookies
|
||||||
? await TryHttpRefreshAsync(cookies)
|
? await TryHttpRefreshAsync(cookies)
|
||||||
: ([], null, null, null, null, false);
|
: ([], null, null, null, null, false);
|
||||||
|
|
||||||
// Fall back to WebView2 (uses the shared browser session, not HttpClient)
|
|
||||||
if (!ok)
|
|
||||||
(limits, email, orgId) = await TryWebView2RefreshAsync();
|
|
||||||
|
|
||||||
// Fill in any blanks from cached values saved at login time
|
// Fill in any blanks from cached values saved at login time
|
||||||
if (string.IsNullOrEmpty(email)) email = AppSettings.Default.Email;
|
if (string.IsNullOrEmpty(email)) email = AppSettings.Default.Email;
|
||||||
if (string.IsNullOrEmpty(orgId)) orgId = AppSettings.Default.OrgId;
|
if (string.IsNullOrEmpty(orgId)) orgId = AppSettings.Default.OrgId;
|
||||||
@@ -189,7 +187,8 @@ public class UsageViewModel : INotifyPropertyChanged
|
|||||||
const string script = @"(async()=>{try{
|
const string script = @"(async()=>{try{
|
||||||
const h={headers:{accept:'application/json'}};
|
const h={headers:{accept:'application/json'}};
|
||||||
const b=await(await fetch('/api/bootstrap',h)).json();
|
const b=await(await fetch('/api/bootstrap',h)).json();
|
||||||
let id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
|
let id=b?.account?.memberships?.[0]?.organization?.uuid
|
||||||
|
||b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
|
||||||
||b?.default_organization?.uuid||null;
|
||b?.default_organization?.uuid||null;
|
||||||
const em=b?.account?.email_address||b?.account?.email||b?.email||null;
|
const em=b?.account?.email_address||b?.account?.email||b?.email||null;
|
||||||
if(!id){
|
if(!id){
|
||||||
@@ -323,6 +322,14 @@ public class UsageViewModel : INotifyPropertyChanged
|
|||||||
http.DefaultRequestHeaders.Add("User-Agent",
|
http.DefaultRequestHeaders.Add("User-Agent",
|
||||||
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 " +
|
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 " +
|
||||||
"(KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36");
|
"(KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36");
|
||||||
|
http.DefaultRequestHeaders.Add("Origin", "https://claude.ai");
|
||||||
|
http.DefaultRequestHeaders.Add("Referer", "https://claude.ai/");
|
||||||
|
http.DefaultRequestHeaders.Add("sec-fetch-dest", "empty");
|
||||||
|
http.DefaultRequestHeaders.Add("sec-fetch-mode", "cors");
|
||||||
|
http.DefaultRequestHeaders.Add("sec-fetch-site", "same-origin");
|
||||||
|
http.DefaultRequestHeaders.Add("sec-ch-ua", "\"Chromium\";v=\"124\", \"Google Chrome\";v=\"124\"");
|
||||||
|
http.DefaultRequestHeaders.Add("sec-ch-ua-mobile", "?0");
|
||||||
|
http.DefaultRequestHeaders.Add("sec-ch-ua-platform", "\"Windows\"");
|
||||||
var cookieHeader = string.Join("; ", cookies.Select(c => $"{c.Name}={c.Value}"));
|
var cookieHeader = string.Join("; ", cookies.Select(c => $"{c.Name}={c.Value}"));
|
||||||
http.DefaultRequestHeaders.Add("Cookie", cookieHeader);
|
http.DefaultRequestHeaders.Add("Cookie", cookieHeader);
|
||||||
return http;
|
return http;
|
||||||
@@ -355,8 +362,9 @@ public class UsageViewModel : INotifyPropertyChanged
|
|||||||
acct.TryGetProperty("email_address", out var em))
|
acct.TryGetProperty("email_address", out var em))
|
||||||
email = em.GetString();
|
email = em.GetString();
|
||||||
|
|
||||||
// Path 1: memberships[0].organization.uuid
|
// Path 1: account.memberships[0].organization.uuid (Claude.ai personal/pro accounts)
|
||||||
if (root.TryGetProperty("memberships", out var mems) && mems.GetArrayLength() > 0)
|
if (root.TryGetProperty("account", out var acctNode) &&
|
||||||
|
acctNode.TryGetProperty("memberships", out var mems) && mems.GetArrayLength() > 0)
|
||||||
{
|
{
|
||||||
var first = mems[0];
|
var first = mems[0];
|
||||||
if (first.TryGetProperty("organization", out var org) &&
|
if (first.TryGetProperty("organization", out var org) &&
|
||||||
@@ -364,7 +372,17 @@ public class UsageViewModel : INotifyPropertyChanged
|
|||||||
orgId = uuid.GetString();
|
orgId = uuid.GetString();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Path 2: organizations[0].uuid (flat list on root)
|
// Path 2: memberships[0].organization.uuid (root-level, older API shape)
|
||||||
|
if (string.IsNullOrEmpty(orgId) &&
|
||||||
|
root.TryGetProperty("memberships", out var rootMems) && rootMems.GetArrayLength() > 0)
|
||||||
|
{
|
||||||
|
var first = rootMems[0];
|
||||||
|
if (first.TryGetProperty("organization", out var org) &&
|
||||||
|
org.TryGetProperty("uuid", out var uuid))
|
||||||
|
orgId = uuid.GetString();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Path 3: organizations[0].uuid (flat list on root)
|
||||||
if (string.IsNullOrEmpty(orgId) &&
|
if (string.IsNullOrEmpty(orgId) &&
|
||||||
root.TryGetProperty("organizations", out var orgs) && orgs.GetArrayLength() > 0)
|
root.TryGetProperty("organizations", out var orgs) && orgs.GetArrayLength() > 0)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user