Compare commits
18
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
204691772c | ||
|
|
15e3f1dd29 | ||
|
|
bcd208684b | ||
|
|
2bdbe4943d | ||
|
|
1c365a55a8 | ||
|
|
8b367ee539 | ||
|
|
9134b8945d | ||
|
|
19b1751e78 | ||
|
|
a20956cde2 | ||
|
|
659171bf0a | ||
|
|
f5b3accc13 | ||
|
|
22e9096f7c | ||
|
|
6aee17fad2 | ||
|
|
b594889239 | ||
|
|
0300e4a72e | ||
|
|
7febb0384f | ||
|
|
55e1f754c5 | ||
|
|
03676a980f |
+41
-14
@@ -47,7 +47,6 @@ public partial class LoginWindow : Window
|
||||
: "Complete sign-in, then click Done.";
|
||||
});
|
||||
|
||||
// Auto-close once we land on any claude.ai page that isn't the login flow
|
||||
if (!uri.Contains("/login") && !uri.Contains("/signin") && signedIn)
|
||||
await SaveAndClose(cookies);
|
||||
};
|
||||
@@ -67,15 +66,25 @@ public partial class LoginWindow : Window
|
||||
|
||||
UsageViewModel.SaveCookies(cookies);
|
||||
|
||||
// Fetch bootstrap + usage from within WebView2 (already authenticated, no header issues)
|
||||
try
|
||||
{
|
||||
// Use WebMessageReceived so the async script can post back without relying
|
||||
// on Promise-awaiting support in the WebView2 runtime version.
|
||||
var tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
EventHandler<CoreWebView2WebMessageReceivedEventArgs>? msgHandler = null;
|
||||
msgHandler = (_, args) =>
|
||||
{
|
||||
Browser.CoreWebView2.WebMessageReceived -= msgHandler;
|
||||
tcs.TrySetResult(args.WebMessageAsJson);
|
||||
};
|
||||
Browser.CoreWebView2.WebMessageReceived += msgHandler;
|
||||
|
||||
const string script = @"(async()=>{try{
|
||||
const h={headers:{accept:'application/json'}};
|
||||
const b=await(await fetch('/api/bootstrap',h)).json();
|
||||
const bkeys=Object.keys(b||{}).join(',');
|
||||
const akeys=Object.keys(b?.account||{}).join(',');
|
||||
let id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
|
||||
const rawB=JSON.stringify(b).slice(0,600);
|
||||
let id=b?.account?.memberships?.[0]?.organization?.uuid
|
||||
||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;
|
||||
let orgSrc='bootstrap';
|
||||
@@ -84,16 +93,23 @@ public partial class LoginWindow : Window
|
||||
if(Array.isArray(ol)&&ol.length>0){id=ol[0]?.uuid||null;orgSrc='orgs-list';}}catch(e2){}
|
||||
}
|
||||
if(!id){
|
||||
try{const pu=await(await fetch('/api/usage',h)).json();
|
||||
if(pu&&!pu.error)return{email:e,orgId:null,usage:pu,debug:'no-org|bkeys:'+bkeys+'|akeys:'+akeys};}catch(e3){}
|
||||
return{email:e,orgId:null,usage:null,debug:'no-org|bkeys:'+bkeys+'|akeys:'+akeys};
|
||||
let pu=null;
|
||||
try{pu=await(await fetch('/api/usage',h)).json();}catch(e3){}
|
||||
window.chrome.webview.postMessage({email:e,orgId:null,usage:(pu&&!pu.error?pu:null),debug:'no-org|raw:'+rawB});
|
||||
return;
|
||||
}
|
||||
const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
|
||||
return{email:e,orgId:id,usage:u,debug:'orgSrc:'+orgSrc+'|bkeys:'+bkeys+'|akeys:'+akeys};
|
||||
}catch(ex){return{error:String(ex)};}})()";
|
||||
const rawU=JSON.stringify(u).slice(0,300);
|
||||
window.chrome.webview.postMessage({email:e,orgId:id,usage:u,debug:'src:'+orgSrc+'|ukeys:'+Object.keys(u||{}).join(',')+'|raw:'+rawB});
|
||||
}catch(ex){window.chrome.webview.postMessage({error:String(ex)});}})()";
|
||||
|
||||
var json = await Browser.CoreWebView2.ExecuteScriptAsync(script);
|
||||
if (json != "null" && !string.IsNullOrEmpty(json))
|
||||
await Browser.CoreWebView2.ExecuteScriptAsync(script);
|
||||
|
||||
// Wait up to 15 s for the script to post its message
|
||||
var completed = await Task.WhenAny(tcs.Task, Task.Delay(15000));
|
||||
var json = completed == tcs.Task ? tcs.Task.Result : null;
|
||||
|
||||
if (!string.IsNullOrEmpty(json))
|
||||
{
|
||||
using var doc = JsonDocument.Parse(json);
|
||||
var root = doc.RootElement;
|
||||
@@ -110,12 +126,23 @@ public partial class LoginWindow : Window
|
||||
if (root.TryGetProperty("debug", out var dbg) && dbg.ValueKind == JsonValueKind.String)
|
||||
AppSettings.Default.DebugInfo = dbg.GetString() ?? "";
|
||||
else if (root.TryGetProperty("error", out var err))
|
||||
AppSettings.Default.DebugInfo = "error:" + err.GetRawText();
|
||||
AppSettings.Default.DebugInfo = "JS error: " + err.GetRawText();
|
||||
else
|
||||
AppSettings.Default.DebugInfo = "timeout or empty message";
|
||||
|
||||
AppSettings.Default.Save();
|
||||
}
|
||||
else
|
||||
{
|
||||
AppSettings.Default.DebugInfo = json == null ? "script timeout (15s)" : "empty message";
|
||||
AppSettings.Default.Save();
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
AppSettings.Default.DebugInfo = "exception: " + ex.Message;
|
||||
AppSettings.Default.Save();
|
||||
}
|
||||
catch { }
|
||||
|
||||
await Dispatcher.InvokeAsync(() => DialogResult = true);
|
||||
}
|
||||
|
||||
@@ -66,7 +66,16 @@
|
||||
|
||||
<!-- Cards scroll area -->
|
||||
<ScrollViewer VerticalScrollBarVisibility="Auto">
|
||||
<StackPanel x:Name="CardsPanel" Margin="0,4,0,4"/>
|
||||
<StackPanel Margin="0,4,0,4">
|
||||
<Border x:Name="DebugBanner" Visibility="Collapsed"
|
||||
Background="{DynamicResource CardBrush}"
|
||||
BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
|
||||
CornerRadius="6" Margin="12,4,12,4" Padding="12,8">
|
||||
<TextBlock x:Name="DebugBannerText" FontSize="10" FontFamily="Consolas"
|
||||
Foreground="{DynamicResource SecondaryBrush}" TextWrapping="Wrap"/>
|
||||
</Border>
|
||||
<StackPanel x:Name="CardsPanel"/>
|
||||
</StackPanel>
|
||||
</ScrollViewer>
|
||||
</DockPanel>
|
||||
|
||||
|
||||
@@ -287,12 +287,15 @@ public partial class PopupWindow : Window
|
||||
var dbg = AppSettings.Default.DebugInfo;
|
||||
if (!string.IsNullOrEmpty(dbg))
|
||||
{
|
||||
DebugText.Text = dbg;
|
||||
DebugText.Visibility = Visibility.Visible;
|
||||
DebugText.Text = dbg;
|
||||
DebugText.Visibility = Visibility.Visible;
|
||||
DebugBannerText.Text = dbg;
|
||||
DebugBanner.Visibility = Visibility.Visible;
|
||||
}
|
||||
else
|
||||
{
|
||||
DebugText.Visibility = Visibility.Collapsed;
|
||||
DebugText.Visibility = Visibility.Collapsed;
|
||||
DebugBanner.Visibility = Visibility.Collapsed;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
## What's new in beta.25
|
||||
## What's new in beta.30
|
||||
|
||||
- Debug: Settings panel now shows bootstrap diagnostic info after sign-in (helps diagnose missing data)
|
||||
- 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: added Origin, Referer, sec-fetch-* and sec-ch-ua headers to HttpClient so the API accepts requests as browser fetches
|
||||
- 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
|
||||
|
||||
+34
-19
@@ -95,15 +95,13 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
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
|
||||
? await TryHttpRefreshAsync(cookies)
|
||||
: ([], 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
|
||||
if (string.IsNullOrEmpty(email)) email = AppSettings.Default.Email;
|
||||
if (string.IsNullOrEmpty(orgId)) orgId = AppSettings.Default.OrgId;
|
||||
@@ -131,12 +129,8 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
|
||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
Limits = limits;
|
||||
Overage = overage;
|
||||
Prepaid = prepaid;
|
||||
if (limits.Count > 0) { Limits = limits; Overage = overage; Prepaid = prepaid; }
|
||||
if (!string.IsNullOrEmpty(email)) UserEmail = email;
|
||||
// Trust that cookies / cached auth mean the user IS signed in,
|
||||
// even if the live fetch failed this cycle.
|
||||
IsSignedIn = true;
|
||||
ErrorMessage = null;
|
||||
LastUpdated = DateTime.Now;
|
||||
@@ -193,7 +187,8 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
const string script = @"(async()=>{try{
|
||||
const h={headers:{accept:'application/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;
|
||||
const em=b?.account?.email_address||b?.account?.email||b?.email||null;
|
||||
if(!id){
|
||||
@@ -201,13 +196,14 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
if(Array.isArray(ol)&&ol.length>0)id=ol[0]?.uuid||null;}catch(e2){}
|
||||
}
|
||||
if(!id){
|
||||
try{const pu=await(await fetch('/api/usage',h)).json();
|
||||
if(pu&&!pu.error)return{email:em,orgId:null,usage:pu};}catch(e3){}
|
||||
return{email:em,orgId:null,usage:null};
|
||||
let pu=null;
|
||||
try{pu=await(await fetch('/api/usage',h)).json();}catch(e3){}
|
||||
window.chrome.webview.postMessage({email:em,orgId:null,usage:(pu&&!pu.error?pu:null)});
|
||||
return;
|
||||
}
|
||||
const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
|
||||
return{email:em,orgId:id,usage:u};
|
||||
}catch(ex){return null;}})()";
|
||||
window.chrome.webview.postMessage({email:em,orgId:id,usage:u});
|
||||
}catch(ex){window.chrome.webview.postMessage(null);}})();";
|
||||
|
||||
var resultJson = await Application.Current.Dispatcher.InvokeAsync(async () =>
|
||||
{
|
||||
@@ -326,6 +322,14 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
http.DefaultRequestHeaders.Add("User-Agent",
|
||||
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/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}"));
|
||||
http.DefaultRequestHeaders.Add("Cookie", cookieHeader);
|
||||
return http;
|
||||
@@ -358,8 +362,9 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
acct.TryGetProperty("email_address", out var em))
|
||||
email = em.GetString();
|
||||
|
||||
// Path 1: memberships[0].organization.uuid
|
||||
if (root.TryGetProperty("memberships", out var mems) && mems.GetArrayLength() > 0)
|
||||
// Path 1: account.memberships[0].organization.uuid (Claude.ai personal/pro accounts)
|
||||
if (root.TryGetProperty("account", out var acctNode) &&
|
||||
acctNode.TryGetProperty("memberships", out var mems) && mems.GetArrayLength() > 0)
|
||||
{
|
||||
var first = mems[0];
|
||||
if (first.TryGetProperty("organization", out var org) &&
|
||||
@@ -367,7 +372,17 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
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) &&
|
||||
root.TryGetProperty("organizations", out var orgs) && orgs.GetArrayLength() > 0)
|
||||
{
|
||||
|
||||
@@ -34,25 +34,34 @@ internal sealed class WebViewFetchWindow : Window
|
||||
|
||||
await _wv.EnsureCoreWebView2Async(env);
|
||||
|
||||
var tcs = new TaskCompletionSource<string?>();
|
||||
var tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
|
||||
EventHandler<CoreWebView2NavigationCompletedEventArgs>? handler = null;
|
||||
handler = async (_, e) =>
|
||||
// Use WebMessageReceived so the script can post back asynchronously without
|
||||
// relying on Promise-awaiting support in the WebView2 runtime version.
|
||||
EventHandler<CoreWebView2WebMessageReceivedEventArgs>? msgHandler = null;
|
||||
msgHandler = (_, args) =>
|
||||
{
|
||||
_wv.CoreWebView2.NavigationCompleted -= handler;
|
||||
_wv.CoreWebView2.WebMessageReceived -= msgHandler;
|
||||
tcs.TrySetResult(args.WebMessageAsJson);
|
||||
};
|
||||
_wv.CoreWebView2.WebMessageReceived += msgHandler;
|
||||
|
||||
EventHandler<CoreWebView2NavigationCompletedEventArgs>? navHandler = null;
|
||||
navHandler = async (_, e) =>
|
||||
{
|
||||
_wv.CoreWebView2.NavigationCompleted -= navHandler;
|
||||
if (!e.IsSuccess) { tcs.TrySetResult(null); return; }
|
||||
try
|
||||
{
|
||||
var result = await _wv.CoreWebView2.ExecuteScriptAsync(script);
|
||||
tcs.TrySetResult(result);
|
||||
}
|
||||
try { await _wv.CoreWebView2.ExecuteScriptAsync(script); }
|
||||
catch { tcs.TrySetResult(null); }
|
||||
};
|
||||
|
||||
_wv.CoreWebView2.NavigationCompleted += handler;
|
||||
_wv.CoreWebView2.NavigationCompleted += navHandler;
|
||||
_wv.CoreWebView2.Navigate(navigateUrl);
|
||||
|
||||
_ = Task.Delay(timeoutMs).ContinueWith(_ => tcs.TrySetResult(null));
|
||||
_ = Task.Delay(timeoutMs).ContinueWith(_ =>
|
||||
{
|
||||
_wv.CoreWebView2.WebMessageReceived -= msgHandler;
|
||||
tcs.TrySetResult(null);
|
||||
});
|
||||
|
||||
return await tcs.Task;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user