Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0300e4a72e | ||
|
|
7febb0384f | ||
|
|
55e1f754c5 | ||
|
|
03676a980f | ||
|
|
a74d0cece5 | ||
|
|
b5cd7b1bc9 | ||
|
|
3249dbd4aa | ||
|
|
189c513677 | ||
|
|
05e66b22d1 |
@@ -14,6 +14,7 @@ public class AppSettings
|
|||||||
public int RefreshInterval { get; set; } = 120;
|
public int RefreshInterval { get; set; } = 120;
|
||||||
public bool ShowInTaskbar { get; set; } = true;
|
public bool ShowInTaskbar { get; set; } = true;
|
||||||
public bool BetaChannel { get; set; } = false;
|
public bool BetaChannel { get; set; } = false;
|
||||||
|
public string DebugInfo { get; set; } = "";
|
||||||
|
|
||||||
private static readonly string FilePath = Path.Combine(
|
private static readonly string FilePath = Path.Combine(
|
||||||
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
|
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
|
||||||
|
|||||||
+45
-11
@@ -47,7 +47,6 @@ public partial class LoginWindow : Window
|
|||||||
: "Complete sign-in, then click Done.";
|
: "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)
|
if (!uri.Contains("/login") && !uri.Contains("/signin") && signedIn)
|
||||||
await SaveAndClose(cookies);
|
await SaveAndClose(cookies);
|
||||||
};
|
};
|
||||||
@@ -67,30 +66,49 @@ public partial class LoginWindow : Window
|
|||||||
|
|
||||||
UsageViewModel.SaveCookies(cookies);
|
UsageViewModel.SaveCookies(cookies);
|
||||||
|
|
||||||
// Fetch bootstrap + usage from within WebView2 (already authenticated, no header issues)
|
|
||||||
try
|
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.WebMessageAsString);
|
||||||
|
};
|
||||||
|
Browser.CoreWebView2.WebMessageReceived += msgHandler;
|
||||||
|
|
||||||
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();
|
||||||
|
const bkeys=Object.keys(b||{}).join(',');
|
||||||
|
const akeys=Object.keys(b?.account||{}).join(',');
|
||||||
let id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
|
let id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
|
||||||
||b?.default_organization?.uuid||null;
|
||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';
|
||||||
if(!id){
|
if(!id){
|
||||||
try{const ol=await(await fetch('/api/organizations',h)).json();
|
try{const ol=await(await fetch('/api/organizations',h)).json();
|
||||||
if(Array.isArray(ol)&&ol.length>0)id=ol[0]?.uuid||null;}catch(e2){}
|
if(Array.isArray(ol)&&ol.length>0){id=ol[0]?.uuid||null;orgSrc='orgs-list';}}catch(e2){}
|
||||||
}
|
}
|
||||||
if(!id){
|
if(!id){
|
||||||
try{const pu=await(await fetch('/api/usage',h)).json();
|
let pu=null;
|
||||||
if(pu&&!pu.error)return{email:e,orgId:null,usage:pu};}catch(e3){}
|
try{pu=await(await fetch('/api/usage',h)).json();}catch(e3){}
|
||||||
return{email:e,orgId:null,usage:null};
|
window.chrome.webview.postMessage(JSON.stringify({email:e,orgId:null,usage:(pu&&!pu.error?pu:null),debug:'no-org|bkeys:'+bkeys+'|akeys:'+akeys}));
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
|
const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
|
||||||
return{email:e,orgId:id,usage:u};
|
window.chrome.webview.postMessage(JSON.stringify({email:e,orgId:id,usage:u,debug:'orgSrc:'+orgSrc+'|bkeys:'+bkeys+'|akeys:'+akeys}));
|
||||||
}catch(ex){return{error:String(ex)};}})()";
|
}catch(ex){window.chrome.webview.postMessage(JSON.stringify({error:String(ex)}));}})()";
|
||||||
|
|
||||||
var json = await Browser.CoreWebView2.ExecuteScriptAsync(script);
|
await Browser.CoreWebView2.ExecuteScriptAsync(script);
|
||||||
if (json != "null" && !string.IsNullOrEmpty(json))
|
|
||||||
|
// 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);
|
using var doc = JsonDocument.Parse(json);
|
||||||
var root = doc.RootElement;
|
var root = doc.RootElement;
|
||||||
@@ -104,10 +122,26 @@ public partial class LoginWindow : Window
|
|||||||
if (root.TryGetProperty("usage", out var us) && us.ValueKind == JsonValueKind.Object)
|
if (root.TryGetProperty("usage", out var us) && us.ValueKind == JsonValueKind.Object)
|
||||||
AppSettings.Default.UsageJson = us.GetRawText();
|
AppSettings.Default.UsageJson = us.GetRawText();
|
||||||
|
|
||||||
|
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 = "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();
|
AppSettings.Default.Save();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch { }
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
AppSettings.Default.DebugInfo = "exception: " + ex.Message;
|
||||||
|
AppSettings.Default.Save();
|
||||||
|
}
|
||||||
|
|
||||||
await Dispatcher.InvokeAsync(() => DialogResult = true);
|
await Dispatcher.InvokeAsync(() => DialogResult = true);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -185,6 +185,10 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
|
<TextBlock x:Name="DebugText" FontSize="10" Foreground="{DynamicResource SecondaryBrush}"
|
||||||
|
TextWrapping="Wrap" Margin="0,12,0,0" FontFamily="Consolas"
|
||||||
|
Visibility="Collapsed"/>
|
||||||
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
|
|||||||
@@ -283,6 +283,17 @@ public partial class PopupWindow : Window
|
|||||||
|
|
||||||
SignOutButton.Visibility = VM.IsSignedIn ? Visibility.Visible : Visibility.Collapsed;
|
SignOutButton.Visibility = VM.IsSignedIn ? Visibility.Visible : Visibility.Collapsed;
|
||||||
SignInButton.Content = VM.IsSignedIn ? "Re-authenticate" : "Sign In";
|
SignInButton.Content = VM.IsSignedIn ? "Re-authenticate" : "Sign In";
|
||||||
|
|
||||||
|
var dbg = AppSettings.Default.DebugInfo;
|
||||||
|
if (!string.IsNullOrEmpty(dbg))
|
||||||
|
{
|
||||||
|
DebugText.Text = dbg;
|
||||||
|
DebugText.Visibility = Visibility.Visible;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
DebugText.Visibility = Visibility.Collapsed;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Event handlers ───────────────────────────────────────────────
|
// ── Event handlers ───────────────────────────────────────────────
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
## What's new in beta.24
|
## What's new in beta.26
|
||||||
|
|
||||||
- Sign-in now shows email and data immediately after login (loads from cache set during login flow)
|
- Fixed: script results now use window.chrome.webview.postMessage instead of async IIFE return value — older WebView2 runtimes don't await Promises from ExecuteScriptAsync, so data was never received
|
||||||
- Background refresh runs 3 seconds after login — avoids WebView2 user data folder lock race
|
- Debug text in Settings will now always show what happened during sign-in
|
||||||
- Added /api/organizations and personal /api/usage fallbacks when bootstrap has no org ID
|
|
||||||
- Broader JS paths for email and org ID
|
|
||||||
|
|||||||
@@ -201,13 +201,14 @@ public class UsageViewModel : INotifyPropertyChanged
|
|||||||
if(Array.isArray(ol)&&ol.length>0)id=ol[0]?.uuid||null;}catch(e2){}
|
if(Array.isArray(ol)&&ol.length>0)id=ol[0]?.uuid||null;}catch(e2){}
|
||||||
}
|
}
|
||||||
if(!id){
|
if(!id){
|
||||||
try{const pu=await(await fetch('/api/usage',h)).json();
|
let pu=null;
|
||||||
if(pu&&!pu.error)return{email:em,orgId:null,usage:pu};}catch(e3){}
|
try{pu=await(await fetch('/api/usage',h)).json();}catch(e3){}
|
||||||
return{email:em,orgId:null,usage:null};
|
window.chrome.webview.postMessage(JSON.stringify({email:em,orgId:null,usage:(pu&&!pu.error?pu:null)}));
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
|
const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
|
||||||
return{email:em,orgId:id,usage:u};
|
window.chrome.webview.postMessage(JSON.stringify({email:em,orgId:id,usage:u}));
|
||||||
}catch(ex){return null;}})()";
|
}catch(ex){window.chrome.webview.postMessage(null);}})();";
|
||||||
|
|
||||||
var resultJson = await Application.Current.Dispatcher.InvokeAsync(async () =>
|
var resultJson = await Application.Current.Dispatcher.InvokeAsync(async () =>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -34,25 +34,34 @@ internal sealed class WebViewFetchWindow : Window
|
|||||||
|
|
||||||
await _wv.EnsureCoreWebView2Async(env);
|
await _wv.EnsureCoreWebView2Async(env);
|
||||||
|
|
||||||
var tcs = new TaskCompletionSource<string?>();
|
var tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||||
|
|
||||||
EventHandler<CoreWebView2NavigationCompletedEventArgs>? handler = null;
|
// Use WebMessageReceived so the script can post back asynchronously without
|
||||||
handler = async (_, e) =>
|
// 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.WebMessageAsString);
|
||||||
|
};
|
||||||
|
_wv.CoreWebView2.WebMessageReceived += msgHandler;
|
||||||
|
|
||||||
|
EventHandler<CoreWebView2NavigationCompletedEventArgs>? navHandler = null;
|
||||||
|
navHandler = async (_, e) =>
|
||||||
|
{
|
||||||
|
_wv.CoreWebView2.NavigationCompleted -= navHandler;
|
||||||
if (!e.IsSuccess) { tcs.TrySetResult(null); return; }
|
if (!e.IsSuccess) { tcs.TrySetResult(null); return; }
|
||||||
try
|
try { await _wv.CoreWebView2.ExecuteScriptAsync(script); }
|
||||||
{
|
|
||||||
var result = await _wv.CoreWebView2.ExecuteScriptAsync(script);
|
|
||||||
tcs.TrySetResult(result);
|
|
||||||
}
|
|
||||||
catch { tcs.TrySetResult(null); }
|
catch { tcs.TrySetResult(null); }
|
||||||
};
|
};
|
||||||
|
_wv.CoreWebView2.NavigationCompleted += navHandler;
|
||||||
_wv.CoreWebView2.NavigationCompleted += handler;
|
|
||||||
_wv.CoreWebView2.Navigate(navigateUrl);
|
_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;
|
return await tcs.Task;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user