Compare commits
13
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8b367ee539 | ||
|
|
9134b8945d | ||
|
|
19b1751e78 | ||
|
|
a20956cde2 | ||
|
|
659171bf0a | ||
|
|
f5b3accc13 | ||
|
|
22e9096f7c | ||
|
|
6aee17fad2 | ||
|
|
b594889239 | ||
|
|
0300e4a72e | ||
|
|
7febb0384f | ||
|
|
55e1f754c5 | ||
|
|
03676a980f |
+40
-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,16 +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(',');
|
||||
const rawB=JSON.stringify(b).slice(0,600);
|
||||
let id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
|
||||
||b?.default_organization?.uuid||null;
|
||||
||b?.default_organization?.uuid||b?.account?.uuid||null;
|
||||
const e=b?.account?.email_address||b?.account?.email||b?.email||null;
|
||||
let orgSrc='bootstrap';
|
||||
if(!id){
|
||||
@@ -84,16 +92,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 +125,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,5 @@
|
||||
## What's new in beta.25
|
||||
## What's new in beta.28
|
||||
|
||||
- Debug: Settings panel now shows bootstrap diagnostic info after sign-in (helps diagnose missing data)
|
||||
- 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: limits no longer wiped when a refresh cycle returns no data (placeholders stay until real data arrives)
|
||||
- Try account.uuid as org ID fallback when no org found in bootstrap
|
||||
|
||||
@@ -131,12 +131,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;
|
||||
@@ -201,13 +197,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 () =>
|
||||
{
|
||||
|
||||
@@ -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