Compare commits
104
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d4f284d829 | ||
|
|
0ed83be9eb | ||
|
|
4cc29292f1 | ||
|
|
fca1a7eb60 | ||
|
|
013569ea8b | ||
|
|
9ef83c1a1e | ||
|
|
cabc2b6326 | ||
|
|
b01afc5be7 | ||
|
|
4b211a17ed | ||
|
|
de41ea9dc4 | ||
|
|
8e71671abb | ||
|
|
af36a817fb | ||
|
|
e908d71eb6 | ||
|
|
ee6b1c4183 | ||
|
|
4377c9a735 | ||
|
|
1cf3f90fd6 | ||
|
|
3d8482cf21 | ||
|
|
44b7feb3c0 | ||
|
|
236990ca45 | ||
|
|
8d523cbb87 | ||
|
|
da270de6d6 | ||
|
|
f4bed1b585 | ||
|
|
ae7a7db37e | ||
|
|
dec6a6eb75 | ||
|
|
7a8350b578 | ||
|
|
222ee55189 | ||
|
|
ec7260bd0d | ||
|
|
6d34567d85 | ||
|
|
4395ae0594 | ||
|
|
4ff2337b4d | ||
|
|
5db9321ac4 | ||
|
|
8c14f59c42 | ||
|
|
a7dc3d553c | ||
|
|
264db5127d | ||
|
|
c71e63905b | ||
|
|
0fc124ac22 | ||
|
|
6858798b14 | ||
|
|
c3ad730677 | ||
|
|
0dcfcbfb6f | ||
|
|
31789df35c | ||
|
|
8e45241ddc | ||
|
|
78e9004624 | ||
|
|
2dcea91a63 | ||
|
|
d240b543eb | ||
|
|
1a35ec064c | ||
|
|
204691772c | ||
|
|
15e3f1dd29 | ||
|
|
bcd208684b | ||
|
|
2bdbe4943d | ||
|
|
1c365a55a8 | ||
|
|
8b367ee539 | ||
|
|
9134b8945d | ||
|
|
19b1751e78 | ||
|
|
a20956cde2 | ||
|
|
659171bf0a | ||
|
|
f5b3accc13 | ||
|
|
22e9096f7c | ||
|
|
6aee17fad2 | ||
|
|
b594889239 | ||
|
|
0300e4a72e | ||
|
|
7febb0384f | ||
|
|
55e1f754c5 | ||
|
|
03676a980f | ||
|
|
a74d0cece5 | ||
|
|
b5cd7b1bc9 | ||
|
|
3249dbd4aa | ||
|
|
189c513677 | ||
|
|
05e66b22d1 | ||
|
|
48e6f64c9a | ||
|
|
d55a92623c | ||
|
|
c70a090983 | ||
|
|
cc0270326e | ||
|
|
7601452f93 | ||
|
|
5a78a021cb | ||
|
|
7d465c13d8 | ||
|
|
ca67039e3e | ||
|
|
1e4cdc09b3 | ||
|
|
4e154bcaa7 | ||
|
|
ea784384c1 | ||
|
|
4e813995c9 | ||
|
|
0ffd690098 | ||
|
|
c083256882 | ||
|
|
fd94c96d83 | ||
|
|
d22eb7381c | ||
|
|
dd59f4565c | ||
|
|
f548210387 | ||
|
|
89659322ac | ||
|
|
bfa476a276 | ||
|
|
7f7024d976 | ||
|
|
f6dc91f38c | ||
|
|
721075d969 | ||
|
|
87ce720a31 | ||
|
|
1172fd8f4e | ||
|
|
11f097b969 | ||
|
|
6e992d56af | ||
|
|
49a0a8c9dd | ||
|
|
f63de02861 | ||
|
|
acabb0e101 | ||
|
|
4945097e8b | ||
|
|
2d478be0ad | ||
|
|
0096199334 | ||
|
|
01f28cf044 | ||
|
|
37939b84ac | ||
|
|
9c8e0dcdb6 |
+143
-36
@@ -1,49 +1,57 @@
|
||||
<Application x:Class="ClaudeCheckerWindows.App"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
|
||||
ShutdownMode="OnExplicitShutdown">
|
||||
<Application.Resources>
|
||||
<SolidColorBrush x:Key="BackgroundBrush" Color="#F3F3F3"/>
|
||||
<SolidColorBrush x:Key="CardBrush" Color="#FFFFFF"/>
|
||||
<SolidColorBrush x:Key="AccentBrush" Color="#F97316"/>
|
||||
<SolidColorBrush x:Key="TextBrush" Color="#1C1C1C"/>
|
||||
<SolidColorBrush x:Key="SecondaryBrush" Color="#6E6E6E"/>
|
||||
<SolidColorBrush x:Key="BorderBrush" Color="#E0E0E0"/>
|
||||
<SolidColorBrush x:Key="BlueBrush" Color="#0078D4"/>
|
||||
<SolidColorBrush x:Key="ButtonBrush" Color="#FFFFFF"/>
|
||||
<SolidColorBrush x:Key="SurfaceBrush" Color="#FAFAFA"/>
|
||||
<SolidColorBrush x:Key="BannerBgBrush" Color="#E8F2FB"/>
|
||||
<SolidColorBrush x:Key="BannerBorderBrush" Color="#B3D6F5"/>
|
||||
<SolidColorBrush x:Key="BackgroundBrush" Color="#F3F3F3" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="CardBrush" Color="#FFFFFF" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="AccentBrush" Color="#F97316" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="TextBrush" Color="#1C1C1C" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="SecondaryBrush" Color="#6E6E6E" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="BorderBrush" Color="#E0E0E0" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="BlueBrush" Color="#0078D4" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="ButtonBrush" Color="#FFFFFF" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="SurfaceBrush" Color="#FAFAFA" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="BannerBgBrush" Color="#E8F2FB" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="BannerBorderBrush" Color="#B3D6F5" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="HoverBrush" Color="#EBEBEB" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="PressedBrush" Color="#D6D6D6" po:Freeze="False"/>
|
||||
<SolidColorBrush x:Key="BadgeBrush" Color="#F0F0F0" po:Freeze="False"/>
|
||||
|
||||
<Style x:Key="HeaderText" TargetType="TextBlock">
|
||||
<Setter Property="FontSize" Value="10"/>
|
||||
<Setter Property="FontWeight" Value="SemiBold"/>
|
||||
<Setter Property="Foreground" Value="{StaticResource SecondaryBrush}"/>
|
||||
<Setter Property="Foreground" Value="{DynamicResource SecondaryBrush}"/>
|
||||
<Setter Property="FontFamily" Value="Segoe UI"/>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="PrimaryButton" TargetType="Button">
|
||||
<Setter Property="Background" Value="{StaticResource BlueBrush}"/>
|
||||
<Setter Property="Foreground" Value="White"/>
|
||||
<Setter Property="BorderThickness" Value="0"/>
|
||||
<Setter Property="Padding" Value="14,6"/>
|
||||
<Setter Property="FontSize" Value="12"/>
|
||||
<Setter Property="FontWeight" Value="SemiBold"/>
|
||||
<Setter Property="FontFamily" Value="Segoe UI"/>
|
||||
<Setter Property="Cursor" Value="Hand"/>
|
||||
<Setter Property="Background" Value="{DynamicResource BlueBrush}"/>
|
||||
<Setter Property="Foreground" Value="White"/>
|
||||
<Setter Property="BorderThickness" Value="0"/>
|
||||
<Setter Property="Padding" Value="14,6"/>
|
||||
<Setter Property="FontSize" Value="12"/>
|
||||
<Setter Property="FontWeight" Value="SemiBold"/>
|
||||
<Setter Property="FontFamily" Value="Segoe UI"/>
|
||||
<Setter Property="Cursor" Value="Hand"/>
|
||||
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="Button">
|
||||
<Border Background="{TemplateBinding Background}" CornerRadius="4"
|
||||
Padding="{TemplateBinding Padding}">
|
||||
<Border x:Name="Bd" Background="{TemplateBinding Background}"
|
||||
CornerRadius="4" Padding="{TemplateBinding Padding}">
|
||||
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter Property="Background" Value="#106EBE"/>
|
||||
<Setter TargetName="Bd" Property="Background" Value="#106EBE"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsPressed" Value="True">
|
||||
<Setter TargetName="Bd" Property="Background" Value="#005A9E"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsEnabled" Value="False">
|
||||
<Setter Property="Background" Value="#BDBDBD"/>
|
||||
<Setter TargetName="Bd" Property="Background" Value="#BDBDBD"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
@@ -52,18 +60,20 @@
|
||||
</Style>
|
||||
|
||||
<Style x:Key="SmallButton" TargetType="Button">
|
||||
<Setter Property="Background" Value="{StaticResource ButtonBrush}"/>
|
||||
<Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
|
||||
<Setter Property="BorderThickness" Value="1"/>
|
||||
<Setter Property="Foreground" Value="{StaticResource TextBrush}"/>
|
||||
<Setter Property="Padding" Value="10,4"/>
|
||||
<Setter Property="FontSize" Value="12"/>
|
||||
<Setter Property="FontFamily" Value="Segoe UI"/>
|
||||
<Setter Property="Cursor" Value="Hand"/>
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonBrush}"/>
|
||||
<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
|
||||
<Setter Property="BorderThickness" Value="1"/>
|
||||
<Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
|
||||
<Setter Property="Padding" Value="10,4"/>
|
||||
<Setter Property="FontSize" Value="12"/>
|
||||
<Setter Property="FontFamily" Value="Segoe UI"/>
|
||||
<Setter Property="Cursor" Value="Hand"/>
|
||||
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="Button">
|
||||
<Border Background="{TemplateBinding Background}"
|
||||
<Border x:Name="Bd"
|
||||
Background="{TemplateBinding Background}"
|
||||
BorderBrush="{TemplateBinding BorderBrush}"
|
||||
BorderThickness="{TemplateBinding BorderThickness}"
|
||||
CornerRadius="4" Padding="{TemplateBinding Padding}">
|
||||
@@ -71,7 +81,10 @@
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter Property="Background" Value="#F0F0F0"/>
|
||||
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource HoverBrush}"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsPressed" Value="True">
|
||||
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource PressedBrush}"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
@@ -80,8 +93,102 @@
|
||||
</Style>
|
||||
|
||||
<Style TargetType="ComboBox">
|
||||
<Setter Property="FontFamily" Value="Segoe UI"/>
|
||||
<Setter Property="FontSize" Value="12"/>
|
||||
<Setter Property="FontFamily" Value="Segoe UI"/>
|
||||
<Setter Property="FontSize" Value="12"/>
|
||||
<Setter Property="Background" Value="{DynamicResource CardBrush}"/>
|
||||
<Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
|
||||
<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
|
||||
<Setter Property="BorderThickness" Value="1"/>
|
||||
<Setter Property="Padding" Value="8,4"/>
|
||||
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="ComboBox">
|
||||
<Grid>
|
||||
<Border x:Name="Bd"
|
||||
Background="{TemplateBinding Background}"
|
||||
BorderBrush="{TemplateBinding BorderBrush}"
|
||||
BorderThickness="{TemplateBinding BorderThickness}"
|
||||
CornerRadius="4">
|
||||
<Grid>
|
||||
<ContentPresenter x:Name="ContentSite"
|
||||
IsHitTestVisible="False"
|
||||
Content="{TemplateBinding SelectionBoxItem}"
|
||||
ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
|
||||
Margin="{TemplateBinding Padding}"
|
||||
VerticalAlignment="Center" HorizontalAlignment="Left"/>
|
||||
<TextBlock Text="▾" FontSize="10"
|
||||
Foreground="{DynamicResource SecondaryBrush}"
|
||||
HorizontalAlignment="Right" VerticalAlignment="Center"
|
||||
Margin="0,0,8,0" IsHitTestVisible="False"/>
|
||||
<!-- Fully transparent toggle — no system chrome bleeds through -->
|
||||
<ToggleButton Focusable="False" ClickMode="Press"
|
||||
FocusVisualStyle="{x:Null}"
|
||||
IsChecked="{Binding IsDropDownOpen, Mode=TwoWay,
|
||||
RelativeSource={RelativeSource TemplatedParent}}">
|
||||
<ToggleButton.Template>
|
||||
<ControlTemplate TargetType="ToggleButton">
|
||||
<Border Background="Transparent"/>
|
||||
</ControlTemplate>
|
||||
</ToggleButton.Template>
|
||||
</ToggleButton>
|
||||
</Grid>
|
||||
</Border>
|
||||
<Popup x:Name="Popup" Placement="Bottom"
|
||||
IsOpen="{TemplateBinding IsDropDownOpen}"
|
||||
AllowsTransparency="True" Focusable="False"
|
||||
PopupAnimation="Slide">
|
||||
<Border SnapsToDevicePixels="True"
|
||||
MinWidth="{TemplateBinding ActualWidth}"
|
||||
MaxHeight="{TemplateBinding MaxDropDownHeight}"
|
||||
Background="{DynamicResource CardBrush}"
|
||||
BorderBrush="{DynamicResource BorderBrush}"
|
||||
BorderThickness="1" CornerRadius="4">
|
||||
<ScrollViewer Margin="0,2">
|
||||
<ItemsPresenter/>
|
||||
</ScrollViewer>
|
||||
</Border>
|
||||
</Popup>
|
||||
</Grid>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource HoverBrush}"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
<Setter Property="ItemContainerStyle">
|
||||
<Setter.Value>
|
||||
<Style TargetType="ComboBoxItem">
|
||||
<Setter Property="Foreground" Value="{DynamicResource TextBrush}"/>
|
||||
<Setter Property="Background" Value="{DynamicResource CardBrush}"/>
|
||||
<Setter Property="Padding" Value="10,5"/>
|
||||
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="ComboBoxItem">
|
||||
<Border x:Name="Bd"
|
||||
Background="{TemplateBinding Background}"
|
||||
Padding="{TemplateBinding Padding}">
|
||||
<ContentPresenter/>
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsHighlighted" Value="True">
|
||||
<Setter TargetName="Bd" Property="Background"
|
||||
Value="{DynamicResource HoverBrush}"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsSelected" Value="True">
|
||||
<Setter TargetName="Bd" Property="Background"
|
||||
Value="{DynamicResource HoverBrush}"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<Style TargetType="ScrollViewer">
|
||||
|
||||
+27
-3
@@ -8,8 +8,12 @@ namespace ClaudeCheckerWindows;
|
||||
|
||||
public partial class App : Application
|
||||
{
|
||||
public static UsageViewModel ViewModel { get; } = new();
|
||||
public static UpdateManager Updater { get; } = new();
|
||||
public static UsageViewModel ViewModel { get; } = new();
|
||||
public static UpdateManager Updater { get; } = new();
|
||||
// Persistent hidden WebView2 — shares the same user data folder as LoginWindow
|
||||
// so its cookies (including cf_clearance) are always live. Used on every refresh
|
||||
// for endpoints that need a real browser session (overage, prepaid).
|
||||
public static WebViewFetchWindow BackgroundBrowser { get; } = new();
|
||||
|
||||
private Forms.NotifyIcon? _tray;
|
||||
private PopupWindow? _popup;
|
||||
@@ -17,14 +21,34 @@ public partial class App : Application
|
||||
|
||||
protected override void OnStartup(StartupEventArgs e)
|
||||
{
|
||||
var logPath = System.IO.Path.Combine(
|
||||
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
|
||||
"ClaudeChecker", "startup_crash.txt");
|
||||
|
||||
AppDomain.CurrentDomain.UnhandledException += (_, ex) =>
|
||||
System.IO.File.WriteAllText(logPath, ex.ExceptionObject?.ToString() ?? "unknown");
|
||||
|
||||
DispatcherUnhandledException += (_, ex) =>
|
||||
{
|
||||
System.IO.File.WriteAllText(logPath, ex.Exception?.ToString() ?? "unknown");
|
||||
ex.Handled = false;
|
||||
};
|
||||
|
||||
base.OnStartup(e);
|
||||
ThemeManager.Initialize();
|
||||
SetupTray();
|
||||
ShowPopup();
|
||||
ScheduleTimer(ViewModel.RefreshInterval);
|
||||
|
||||
// Show background browser window on the UI thread before Task.Run
|
||||
BackgroundBrowser.Show();
|
||||
|
||||
_ = Task.Run(async () =>
|
||||
{
|
||||
await Task.Delay(1000);
|
||||
await ViewModel.LoadFromCacheAsync();
|
||||
// Initialize the persistent background browser (navigates to claude.ai once)
|
||||
await Application.Current.Dispatcher.InvokeAsync(
|
||||
() => BackgroundBrowser.InitAsync()).Task.Unwrap();
|
||||
await ViewModel.RefreshAsync();
|
||||
await Updater.CheckForUpdatesAsync();
|
||||
});
|
||||
|
||||
@@ -6,8 +6,14 @@ namespace ClaudeCheckerWindows;
|
||||
|
||||
public class AppSettings
|
||||
{
|
||||
// Auth signal — non-empty means the user has completed sign-in at least once.
|
||||
// The WebView2 user-data folder holds the live session; this is only for startup.
|
||||
public string CookieStore { get; set; } = "";
|
||||
|
||||
// Accumulated sparkline data — built up over multiple refreshes.
|
||||
public string BurnHistory { get; set; } = "";
|
||||
|
||||
// User preferences
|
||||
public int RefreshInterval { get; set; } = 120;
|
||||
public bool ShowInTaskbar { get; set; } = true;
|
||||
public bool BetaChannel { get; set; } = false;
|
||||
|
||||
@@ -26,9 +26,7 @@
|
||||
<None Update="Assets\icon.ico">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="Assets\icon.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<Resource Include="Assets\icon.png"/>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -46,27 +46,16 @@ public class GaugeControl : FrameworkElement
|
||||
DrawArc(dc, cx, cy, radius, StartAngleDeg, SweepDeg * (Percent / 100.0),
|
||||
new Pen(Accent, StrokeWidth));
|
||||
|
||||
var dpi = VisualTreeHelper.GetDpi(this).PixelsPerDip;
|
||||
|
||||
var dpi = VisualTreeHelper.GetDpi(this).PixelsPerDip;
|
||||
var textColor = ThemeManager.IsDark ? Color.FromRgb(0xF5, 0xF5, 0xF5) : Color.FromRgb(0x1C, 0x1C, 0x1C);
|
||||
var subColor = Color.FromRgb(0x9E, 0x9E, 0x9E);
|
||||
|
||||
var pctText = new FormattedText(
|
||||
$"{(int)Math.Round(Percent)}%",
|
||||
CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
|
||||
new Typeface(new FontFamily("Segoe UI"), FontStyles.Normal, FontWeights.Bold, FontStretches.Normal),
|
||||
14, new SolidColorBrush(textColor), dpi);
|
||||
dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height - 1));
|
||||
18, new SolidColorBrush(textColor), dpi);
|
||||
|
||||
var sub = new FormattedText(
|
||||
"Updated\nnow",
|
||||
CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
|
||||
new Typeface("Segoe UI"), 7,
|
||||
new SolidColorBrush(subColor), dpi)
|
||||
{
|
||||
TextAlignment = TextAlignment.Center
|
||||
};
|
||||
dc.DrawText(sub, new Point(cx - sub.Width / 2, cy + 2));
|
||||
dc.DrawText(pctText, new Point(cx - pctText.Width / 2, cy - pctText.Height / 2));
|
||||
}
|
||||
|
||||
private static void DrawArc(DrawingContext dc, double cx, double cy, double r,
|
||||
|
||||
+15
-11
@@ -1,7 +1,5 @@
|
||||
using Microsoft.Web.WebView2.Core;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
|
||||
@@ -9,6 +7,8 @@ namespace ClaudeCheckerWindows;
|
||||
|
||||
public partial class LoginWindow : Window
|
||||
{
|
||||
private bool _closing;
|
||||
|
||||
public LoginWindow()
|
||||
{
|
||||
InitializeComponent();
|
||||
@@ -19,7 +19,7 @@ public partial class LoginWindow : Window
|
||||
{
|
||||
var env = await CoreWebView2Environment.CreateAsync(userDataFolder:
|
||||
System.IO.Path.Combine(
|
||||
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
|
||||
System.Environment.GetFolderPath(System.Environment.SpecialFolder.LocalApplicationData),
|
||||
"ClaudeChecker", "WebView2"));
|
||||
|
||||
await Browser.EnsureCoreWebView2Async(env);
|
||||
@@ -27,14 +27,14 @@ public partial class LoginWindow : Window
|
||||
|
||||
Browser.CoreWebView2.NavigationCompleted += async (_, e) =>
|
||||
{
|
||||
if (!e.IsSuccess) return;
|
||||
if (!e.IsSuccess || _closing) return;
|
||||
var uri = Browser.CoreWebView2.Source;
|
||||
if (!uri.Contains("claude.ai")) return;
|
||||
|
||||
var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
|
||||
var signedIn = cookies.Any(c =>
|
||||
c.Name.Equals("sessionKey", StringComparison.OrdinalIgnoreCase) ||
|
||||
c.Name.StartsWith("sk-ant", StringComparison.OrdinalIgnoreCase));
|
||||
var signedIn = System.Linq.Enumerable.Any(cookies, c =>
|
||||
c.Name.Equals("sessionKey", System.StringComparison.OrdinalIgnoreCase) ||
|
||||
c.Name.StartsWith("sk-ant", System.StringComparison.OrdinalIgnoreCase));
|
||||
|
||||
await Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
@@ -44,23 +44,27 @@ public partial class LoginWindow : Window
|
||||
: "Complete sign-in, then click Done.";
|
||||
});
|
||||
|
||||
// Auto-close only on explicit post-login redirects, not on initial load
|
||||
if (signedIn && (uri.Contains("/chats") || uri.Contains("/new")))
|
||||
{
|
||||
if (!uri.Contains("/login") && !uri.Contains("/signin") && signedIn)
|
||||
await SaveAndClose(cookies);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private async void Done_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (_closing) return;
|
||||
var cookies = await Browser.CoreWebView2.CookieManager.GetCookiesAsync("https://claude.ai");
|
||||
await SaveAndClose(cookies);
|
||||
}
|
||||
|
||||
private async Task SaveAndClose(IReadOnlyList<CoreWebView2Cookie> cookies)
|
||||
{
|
||||
if (_closing) return;
|
||||
_closing = true;
|
||||
|
||||
// Persist cookies so the app knows the user is signed in on next startup.
|
||||
// All live data is fetched by the background WebView2 on the next refresh.
|
||||
UsageViewModel.SaveCookies(cookies);
|
||||
|
||||
await Dispatcher.InvokeAsync(() => DialogResult = true);
|
||||
}
|
||||
}
|
||||
|
||||
+11
-2
@@ -21,8 +21,9 @@ public class AgentLimit
|
||||
|
||||
public class UsageResponse
|
||||
{
|
||||
[JsonPropertyName("claude_ai_default_5h")] public WindowData? FiveHour { get; set; }
|
||||
[JsonPropertyName("claude_ai_default")] public WindowData? SevenDay { get; set; }
|
||||
[JsonPropertyName("five_hour")] public WindowData? FiveHour { get; set; }
|
||||
[JsonPropertyName("seven_day")] public WindowData? SevenDay { get; set; }
|
||||
[JsonPropertyName("extra_usage")] public ExtraUsage? ExtraUsage { get; set; }
|
||||
}
|
||||
|
||||
public class WindowData
|
||||
@@ -31,6 +32,14 @@ public class WindowData
|
||||
[JsonPropertyName("resets_at")] public string? ResetsAt { get; set; }
|
||||
}
|
||||
|
||||
public class ExtraUsage
|
||||
{
|
||||
[JsonPropertyName("is_enabled")] public bool IsEnabled { get; set; }
|
||||
[JsonPropertyName("currency")] public string? Currency { get; set; }
|
||||
[JsonPropertyName("used_credits")] public double? UsedCredits { get; set; }
|
||||
[JsonPropertyName("monthly_limit")] public double? MonthlyLimit { get; set; }
|
||||
}
|
||||
|
||||
public class BootstrapResponse
|
||||
{
|
||||
[JsonPropertyName("account")] public AccountInfo? Account { get; set; }
|
||||
|
||||
+54
-48
@@ -5,7 +5,7 @@
|
||||
Title="ClaudeChecker"
|
||||
Width="480" Height="660"
|
||||
WindowStartupLocation="CenterScreen"
|
||||
Background="{StaticResource BackgroundBrush}"
|
||||
Background="{DynamicResource BackgroundBrush}"
|
||||
FontFamily="Segoe UI"
|
||||
ShowInTaskbar="True"
|
||||
ResizeMode="NoResize">
|
||||
@@ -16,8 +16,8 @@
|
||||
|
||||
<!-- Update banner -->
|
||||
<Border x:Name="UpdateBanner" DockPanel.Dock="Top" Visibility="Collapsed"
|
||||
Background="{StaticResource BannerBgBrush}"
|
||||
BorderBrush="{StaticResource BannerBorderBrush}" BorderThickness="0,0,0,1"
|
||||
Background="{DynamicResource BannerBgBrush}"
|
||||
BorderBrush="{DynamicResource BannerBorderBrush}" BorderThickness="0,0,0,1"
|
||||
Cursor="Hand" MouseLeftButtonUp="UpdateBanner_Click">
|
||||
<Grid Margin="16,10">
|
||||
<Grid.ColumnDefinitions>
|
||||
@@ -26,21 +26,21 @@
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Grid.Column="0" Text="⬇" FontSize="14"
|
||||
Foreground="{StaticResource BlueBrush}" VerticalAlignment="Center"/>
|
||||
Foreground="{DynamicResource BlueBrush}" VerticalAlignment="Center"/>
|
||||
<StackPanel Grid.Column="1" Margin="10,0">
|
||||
<TextBlock x:Name="UpdateBannerTitle" FontSize="12" FontWeight="SemiBold"
|
||||
Foreground="{StaticResource TextBrush}"/>
|
||||
Foreground="{DynamicResource TextBrush}"/>
|
||||
<TextBlock Text="Click to view release notes and install."
|
||||
FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
|
||||
FontSize="11" Foreground="{DynamicResource SecondaryBrush}"/>
|
||||
</StackPanel>
|
||||
<Button Grid.Column="2" Content="Update" Style="{StaticResource SmallButton}"
|
||||
Foreground="{StaticResource BlueBrush}" Click="UpdateBanner_Click"/>
|
||||
Foreground="{DynamicResource BlueBrush}" Click="UpdateBanner_Click"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<!-- Footer -->
|
||||
<Border DockPanel.Dock="Bottom" BorderBrush="{StaticResource BorderBrush}"
|
||||
BorderThickness="0,1,0,0" Background="{StaticResource SurfaceBrush}">
|
||||
<Border DockPanel.Dock="Bottom" BorderBrush="{DynamicResource BorderBrush}"
|
||||
BorderThickness="0,1,0,0" Background="{DynamicResource SurfaceBrush}">
|
||||
<Grid Margin="12,8">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
@@ -55,7 +55,7 @@
|
||||
Width="12" Height="12" Visibility="Collapsed"
|
||||
Style="{x:Null}" Margin="0,0,6,0"/>
|
||||
<TextBlock x:Name="LastUpdatedText" FontSize="11"
|
||||
Foreground="{StaticResource SecondaryBrush}" VerticalAlignment="Center"/>
|
||||
Foreground="{DynamicResource SecondaryBrush}" VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
<Button Grid.Column="1" Content="↻ Refresh"
|
||||
Style="{StaticResource SmallButton}" Click="Refresh_Click"/>
|
||||
@@ -72,17 +72,17 @@
|
||||
|
||||
<!-- Settings panel -->
|
||||
<Border x:Name="SettingsPanel" Visibility="Collapsed"
|
||||
Background="{StaticResource BackgroundBrush}">
|
||||
Background="{DynamicResource BackgroundBrush}">
|
||||
<DockPanel>
|
||||
<Border DockPanel.Dock="Top" BorderBrush="{StaticResource BorderBrush}"
|
||||
BorderThickness="0,0,0,1" Background="{StaticResource SurfaceBrush}" Padding="12,10">
|
||||
<Border DockPanel.Dock="Top" BorderBrush="{DynamicResource BorderBrush}"
|
||||
BorderThickness="0,0,0,1" Background="{DynamicResource SurfaceBrush}" Padding="12,10">
|
||||
<Grid>
|
||||
<Button Content="← Back" HorizontalAlignment="Left"
|
||||
Style="{StaticResource SmallButton}" BorderThickness="0"
|
||||
Foreground="{StaticResource BlueBrush}" Background="Transparent"
|
||||
Foreground="{DynamicResource BlueBrush}" Background="Transparent"
|
||||
Click="BackFromSettings_Click"/>
|
||||
<TextBlock Text="Settings" FontSize="14" FontWeight="SemiBold"
|
||||
Foreground="{StaticResource TextBrush}"
|
||||
Foreground="{DynamicResource TextBrush}"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
@@ -91,13 +91,13 @@
|
||||
<StackPanel Margin="20,16,20,20">
|
||||
|
||||
<TextBlock Text="AUTHENTICATION" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
|
||||
<Border Background="{StaticResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
|
||||
<Border Background="{DynamicResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
|
||||
Padding="14,12" Margin="0,0,0,16">
|
||||
<StackPanel>
|
||||
<StackPanel x:Name="AuthPanel" Margin="0,0,0,10"/>
|
||||
<TextBlock Text="Your session is stored locally and persists across restarts."
|
||||
FontSize="11" Foreground="{StaticResource SecondaryBrush}"
|
||||
FontSize="11" Foreground="{DynamicResource SecondaryBrush}"
|
||||
TextWrapping="Wrap" Margin="0,0,0,10"/>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Button x:Name="SignInButton" Content="Sign In"
|
||||
@@ -112,8 +112,8 @@
|
||||
</Border>
|
||||
|
||||
<TextBlock Text="UPDATE CHANNEL" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
|
||||
<Border Background="{StaticResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
|
||||
<Border Background="{DynamicResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
|
||||
Padding="14,12" Margin="0,0,0,16">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
@@ -122,9 +122,9 @@
|
||||
</Grid.ColumnDefinitions>
|
||||
<StackPanel>
|
||||
<TextBlock Text="Beta updates" FontSize="12" FontWeight="SemiBold"
|
||||
Foreground="{StaticResource TextBrush}"/>
|
||||
Foreground="{DynamicResource TextBrush}"/>
|
||||
<TextBlock Text="Receive early access builds — may be less stable"
|
||||
FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
|
||||
FontSize="11" Foreground="{DynamicResource SecondaryBrush}"/>
|
||||
</StackPanel>
|
||||
<CheckBox Grid.Column="1" x:Name="BetaToggle" VerticalAlignment="Center"
|
||||
Checked="BetaToggle_Changed" Unchecked="BetaToggle_Changed"/>
|
||||
@@ -132,8 +132,8 @@
|
||||
</Border>
|
||||
|
||||
<TextBlock Text="AUTO-REFRESH" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
|
||||
<Border Background="{StaticResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
|
||||
<Border Background="{DynamicResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
|
||||
Padding="14,12" Margin="0,0,0,16">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
@@ -141,15 +141,15 @@
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="Refresh interval" FontSize="12" FontWeight="SemiBold"
|
||||
Foreground="{StaticResource TextBrush}" VerticalAlignment="Center"/>
|
||||
Foreground="{DynamicResource TextBrush}" VerticalAlignment="Center"/>
|
||||
<ComboBox Grid.Column="1" x:Name="RefreshPicker" Width="100"
|
||||
SelectionChanged="RefreshPicker_Changed"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<TextBlock Text="ABOUT" Style="{StaticResource HeaderText}" Margin="0,0,0,8"/>
|
||||
<Border Background="{StaticResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
|
||||
<Border Background="{DynamicResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
|
||||
Padding="14,12">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
@@ -162,20 +162,26 @@
|
||||
<StackPanel Grid.Column="1" VerticalAlignment="Center">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="ClaudeChecker" FontSize="12" FontWeight="SemiBold"
|
||||
Foreground="{StaticResource TextBrush}"/>
|
||||
<Border Background="#F0F0F0" CornerRadius="3"
|
||||
Foreground="{DynamicResource TextBrush}"/>
|
||||
<Border Background="{DynamicResource BadgeBrush}" CornerRadius="3"
|
||||
Margin="6,0,0,0" Padding="5,1">
|
||||
<TextBlock x:Name="VersionLabel" FontSize="11"
|
||||
Foreground="{StaticResource SecondaryBrush}"
|
||||
Foreground="{DynamicResource SecondaryBrush}"
|
||||
FontFamily="Consolas"/>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
<TextBlock Text="Built by superdooper86 & claude"
|
||||
FontSize="11" Foreground="{StaticResource SecondaryBrush}"/>
|
||||
FontSize="11" Foreground="{DynamicResource SecondaryBrush}"/>
|
||||
</StackPanel>
|
||||
<StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right">
|
||||
<Button x:Name="CheckUpdateButton"
|
||||
Style="{StaticResource SmallButton}"
|
||||
Click="CheckUpdate_Click"/>
|
||||
<TextBlock x:Name="UpdateAvailableText" FontSize="10"
|
||||
Foreground="{DynamicResource BlueBrush}"
|
||||
HorizontalAlignment="Center"
|
||||
Visibility="Collapsed" Margin="0,4,0,0"/>
|
||||
</StackPanel>
|
||||
<Button Grid.Column="2" x:Name="CheckUpdateButton"
|
||||
Style="{StaticResource SmallButton}"
|
||||
Click="CheckUpdate_Click" VerticalAlignment="Center"/>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
@@ -186,17 +192,17 @@
|
||||
|
||||
<!-- Update panel -->
|
||||
<Border x:Name="UpdatePanel" Visibility="Collapsed"
|
||||
Background="{StaticResource BackgroundBrush}">
|
||||
Background="{DynamicResource BackgroundBrush}">
|
||||
<DockPanel>
|
||||
<Border DockPanel.Dock="Top" BorderBrush="{StaticResource BorderBrush}"
|
||||
BorderThickness="0,0,0,1" Background="{StaticResource SurfaceBrush}" Padding="12,10">
|
||||
<Border DockPanel.Dock="Top" BorderBrush="{DynamicResource BorderBrush}"
|
||||
BorderThickness="0,0,0,1" Background="{DynamicResource SurfaceBrush}" Padding="12,10">
|
||||
<Grid>
|
||||
<Button Content="← Back" HorizontalAlignment="Left"
|
||||
Style="{StaticResource SmallButton}" BorderThickness="0"
|
||||
Foreground="{StaticResource BlueBrush}" Background="Transparent"
|
||||
Foreground="{DynamicResource BlueBrush}" Background="Transparent"
|
||||
Click="CloseUpdate_Click"/>
|
||||
<TextBlock Text="Update Available" FontSize="14" FontWeight="SemiBold"
|
||||
Foreground="{StaticResource TextBrush}"
|
||||
Foreground="{DynamicResource TextBrush}"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
||||
<Button x:Name="NotNowButton" Content="Not Now" HorizontalAlignment="Right"
|
||||
Style="{StaticResource SmallButton}" Click="CloseUpdate_Click"/>
|
||||
@@ -204,8 +210,8 @@
|
||||
</Border>
|
||||
|
||||
<StackPanel Margin="20,16">
|
||||
<Border Background="{StaticResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
|
||||
<Border Background="{DynamicResource CardBrush}" CornerRadius="6"
|
||||
BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
|
||||
Padding="14,12" Margin="0,0,0,12">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
@@ -217,26 +223,26 @@
|
||||
<StackPanel Grid.Column="1" VerticalAlignment="Center">
|
||||
<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
|
||||
<TextBlock x:Name="CurrentVerLabel" FontSize="12" FontFamily="Consolas"
|
||||
Foreground="{StaticResource SecondaryBrush}" VerticalAlignment="Center"/>
|
||||
<TextBlock Text=" → " FontSize="11" Foreground="{StaticResource SecondaryBrush}"
|
||||
Foreground="{DynamicResource SecondaryBrush}" VerticalAlignment="Center"/>
|
||||
<TextBlock Text=" → " FontSize="11" Foreground="{DynamicResource SecondaryBrush}"
|
||||
VerticalAlignment="Center"/>
|
||||
<TextBlock x:Name="NewVerLabel" FontSize="13" FontWeight="SemiBold"
|
||||
FontFamily="Consolas" Foreground="{StaticResource BlueBrush}"
|
||||
FontFamily="Consolas" Foreground="{DynamicResource BlueBrush}"
|
||||
VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
<TextBlock x:Name="ReleaseNotesText" FontSize="11" TextWrapping="Wrap"
|
||||
Foreground="{StaticResource SecondaryBrush}" MaxHeight="160"/>
|
||||
Foreground="{DynamicResource SecondaryBrush}" MaxHeight="160"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
<TextBlock x:Name="UpdateStatusText" Foreground="{StaticResource SecondaryBrush}"
|
||||
<TextBlock x:Name="UpdateStatusText" Foreground="{DynamicResource SecondaryBrush}"
|
||||
FontSize="11" TextWrapping="Wrap" TextAlignment="Center"
|
||||
Visibility="Collapsed" Margin="0,0,0,8"/>
|
||||
<ProgressBar x:Name="UpdateProgress" Visibility="Collapsed"
|
||||
Height="4" Margin="0,0,0,12" Foreground="{StaticResource BlueBrush}"/>
|
||||
Height="4" Margin="0,0,0,12" Foreground="{DynamicResource BlueBrush}"/>
|
||||
<TextBlock Text="ClaudeChecker will download, replace itself, and relaunch automatically."
|
||||
FontSize="11" Foreground="{StaticResource SecondaryBrush}"
|
||||
FontSize="11" Foreground="{DynamicResource SecondaryBrush}"
|
||||
TextWrapping="Wrap" TextAlignment="Center" Margin="0,0,0,12"/>
|
||||
<Button x:Name="InstallButton" Content="⬇ Download & Install"
|
||||
Style="{StaticResource PrimaryButton}" HorizontalAlignment="Stretch"
|
||||
|
||||
+240
-40
@@ -14,7 +14,6 @@ public partial class PopupWindow : Window
|
||||
private static readonly UsageViewModel VM = App.ViewModel;
|
||||
private static readonly UpdateManager Updater = App.Updater;
|
||||
private readonly DispatcherTimer _clockTimer;
|
||||
private bool _dialogOpen;
|
||||
|
||||
[DllImport("dwmapi.dll")]
|
||||
private static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, ref int value, int size);
|
||||
@@ -55,6 +54,13 @@ public partial class PopupWindow : Window
|
||||
CardsPanel.Children.Clear();
|
||||
foreach (var limit in VM.Limits)
|
||||
CardsPanel.Children.Add(BuildCard(limit));
|
||||
|
||||
if (VM.ExtraUsage?.IsEnabled == true)
|
||||
CardsPanel.Children.Add(BuildExtraUsageSection());
|
||||
|
||||
var fiveHour = VM.Limits.FirstOrDefault(l => l.Window == WindowKind.FiveHour);
|
||||
if (fiveHour != null && fiveHour.BurnHistory.Count > 0)
|
||||
CardsPanel.Children.Add(BuildDiarySection(fiveHour));
|
||||
}
|
||||
|
||||
private static UIElement BuildCard(AgentLimit limit)
|
||||
@@ -64,10 +70,8 @@ public partial class PopupWindow : Window
|
||||
var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
|
||||
var border = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
|
||||
|
||||
// Gauge
|
||||
var gauge = new GaugeControl { Width = 76, Height = 76, Percent = limit.UsedPercent, Accent = accent };
|
||||
|
||||
// Live badge
|
||||
var liveBadge = new Border
|
||||
{
|
||||
Background = new SolidColorBrush(Color.FromArgb(30, 0, 160, 0)),
|
||||
@@ -79,7 +83,6 @@ public partial class PopupWindow : Window
|
||||
Foreground = new SolidColorBrush(Color.FromRgb(0, 120, 0)) }
|
||||
};
|
||||
|
||||
// Usage badge
|
||||
var usageBadge = new Border
|
||||
{
|
||||
Background = new SolidColorBrush(Color.FromArgb(18, 0, 0, 0)),
|
||||
@@ -117,36 +120,56 @@ public partial class PopupWindow : Window
|
||||
BorderThickness = new Thickness(0),
|
||||
};
|
||||
|
||||
var timeStack = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
|
||||
timeStack.Children.Add(new TextBlock { Text = "⏱ ", FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
|
||||
timeStack.Children.Add(new TextBlock { Text = limit.TimeRemaining, FontSize = 12,
|
||||
// Left: time remaining + reset date inline
|
||||
var timeLeft = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center };
|
||||
timeLeft.Children.Add(new TextBlock { Text = "⏱ ", FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
|
||||
timeLeft.Children.Add(new TextBlock { Text = limit.TimeRemaining, FontSize = 12,
|
||||
FontWeight = FontWeights.Medium, Foreground = text, VerticalAlignment = VerticalAlignment.Center });
|
||||
|
||||
var resetText = new TextBlock
|
||||
timeLeft.Children.Add(new TextBlock
|
||||
{
|
||||
Text = $"Resets {limit.ResetDate:d MMM yyyy} at {limit.ResetDate:HH:mm}",
|
||||
FontSize = 11, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
|
||||
};
|
||||
Text = $" Resets {limit.ResetDate:d MMM yyyy} at {limit.ResetDate:HH:mm}",
|
||||
FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
|
||||
});
|
||||
|
||||
// Right: "after reset" when 0%, "today HH:MM" when refreshed today
|
||||
string? refreshLabel = limit.UsedPercent == 0
|
||||
? "after reset"
|
||||
: VM.LastUpdated?.Date == DateTime.Today
|
||||
? "today " + VM.LastUpdated.Value.ToString("h:mm tt")
|
||||
: null;
|
||||
|
||||
UIElement timeRight;
|
||||
if (refreshLabel != null)
|
||||
{
|
||||
var inner = new StackPanel { Orientation = Orientation.Horizontal };
|
||||
inner.Children.Add(new TextBlock { Text = "↗ ", FontSize = 10, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
|
||||
inner.Children.Add(new TextBlock { Text = refreshLabel, FontSize = 10, FontWeight = FontWeights.Medium,
|
||||
Foreground = secondary, VerticalAlignment = VerticalAlignment.Center });
|
||||
timeRight = new Border
|
||||
{
|
||||
Background = new SolidColorBrush(Color.FromArgb(18, 0, 0, 0)),
|
||||
CornerRadius = new CornerRadius(4),
|
||||
Padding = new Thickness(6, 2, 6, 2),
|
||||
Child = inner
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
timeRight = new TextBlock();
|
||||
}
|
||||
|
||||
var timeRow = new Grid();
|
||||
timeRow.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
|
||||
timeRow.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
|
||||
Grid.SetColumn(timeStack, 0);
|
||||
Grid.SetColumn(resetText, 1);
|
||||
timeRow.Children.Add(timeStack);
|
||||
timeRow.Children.Add(resetText);
|
||||
|
||||
var sparkline = new SparklineControl
|
||||
{
|
||||
Height = 28, Margin = new Thickness(0, 8, 0, 0), LineColor = Color.FromRgb(0xF9, 0x73, 0x16),
|
||||
Data = limit.BurnHistory.Count > 0 ? limit.BurnHistory : null,
|
||||
};
|
||||
Grid.SetColumn(timeLeft, 0);
|
||||
Grid.SetColumn(timeRight, 1);
|
||||
timeRow.Children.Add(timeLeft);
|
||||
timeRow.Children.Add(timeRight);
|
||||
|
||||
var infoPanel = new StackPanel { VerticalAlignment = VerticalAlignment.Center };
|
||||
infoPanel.Children.Add(headerRow);
|
||||
infoPanel.Children.Add(progress);
|
||||
infoPanel.Children.Add(timeRow);
|
||||
infoPanel.Children.Add(sparkline);
|
||||
|
||||
var cardGrid = new Grid { Margin = new Thickness(16, 12, 16, 12) };
|
||||
cardGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
|
||||
@@ -180,12 +203,147 @@ public partial class PopupWindow : Window
|
||||
return section;
|
||||
}
|
||||
|
||||
private static UIElement BuildDiarySection(AgentLimit limit)
|
||||
{
|
||||
var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
|
||||
var border = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
|
||||
|
||||
// Stats row inside the card (mirrors macOS layout without the Claude icon/header)
|
||||
var statsRow = new Grid { Margin = new Thickness(12, 10, 12, 6) };
|
||||
statsRow.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
|
||||
statsRow.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
|
||||
var samplesText = new TextBlock
|
||||
{
|
||||
Text = $"{limit.BurnHistory.Count} samples",
|
||||
FontSize = 11, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
|
||||
};
|
||||
var burnText = new TextBlock
|
||||
{
|
||||
Text = $"Avg burn rate: {limit.BurnRate:F1}%/h",
|
||||
FontSize = 11, Foreground = secondary, VerticalAlignment = VerticalAlignment.Center
|
||||
};
|
||||
Grid.SetColumn(samplesText, 0);
|
||||
Grid.SetColumn(burnText, 1);
|
||||
statsRow.Children.Add(samplesText);
|
||||
statsRow.Children.Add(burnText);
|
||||
|
||||
var sparkline = new SparklineControl
|
||||
{
|
||||
Height = 40,
|
||||
Margin = new Thickness(8, 0, 8, 8),
|
||||
LineColor = Color.FromRgb(0xF9, 0x73, 0x16),
|
||||
Data = limit.BurnHistory,
|
||||
};
|
||||
|
||||
var cardContent = new StackPanel();
|
||||
cardContent.Children.Add(statsRow);
|
||||
cardContent.Children.Add(sparkline);
|
||||
|
||||
var card = new Border
|
||||
{
|
||||
Background = (SolidColorBrush)Application.Current.Resources["CardBrush"],
|
||||
CornerRadius = new CornerRadius(6),
|
||||
BorderBrush = border,
|
||||
BorderThickness = new Thickness(1),
|
||||
Margin = new Thickness(12, 0, 12, 0),
|
||||
Child = cardContent,
|
||||
};
|
||||
|
||||
var sectionLabel = new TextBlock
|
||||
{
|
||||
Text = "SESSION DIARY",
|
||||
Style = (Style)Application.Current.Resources["HeaderText"],
|
||||
Margin = new Thickness(16, 12, 16, 6),
|
||||
};
|
||||
|
||||
var section = new StackPanel();
|
||||
section.Children.Add(sectionLabel);
|
||||
section.Children.Add(card);
|
||||
return section;
|
||||
}
|
||||
|
||||
private UIElement BuildExtraUsageSection()
|
||||
{
|
||||
var text = (SolidColorBrush)Application.Current.Resources["TextBrush"];
|
||||
var secondary = (SolidColorBrush)Application.Current.Resources["SecondaryBrush"];
|
||||
var border = (SolidColorBrush)Application.Current.Resources["BorderBrush"];
|
||||
var accent = new SolidColorBrush(Color.FromRgb(0xF9, 0x73, 0x16));
|
||||
|
||||
var overage = VM.Overage;
|
||||
var prepaid = VM.Prepaid;
|
||||
var currency = VM.ExtraUsage?.Currency ?? overage?.Currency ?? "$";
|
||||
|
||||
// All credit values from the API are in cents — divide by 100.
|
||||
var spent = (overage?.UsedCredits / 100.0) ?? (VM.ExtraUsage?.UsedCredits / 100.0) ?? 0;
|
||||
var limit = (overage?.MonthlyCreditLimit / 100.0) ?? (VM.ExtraUsage?.MonthlyLimit / 100.0) ?? 0;
|
||||
var balance = (prepaid?.Amount / 100.0) ?? 0;
|
||||
|
||||
bool unlimited = overage?.MonthlyCreditLimit == null && VM.ExtraUsage?.MonthlyLimit == null;
|
||||
|
||||
UIElement MakeRow(string label, string value, bool highlight = false)
|
||||
{
|
||||
var row = new Grid { Margin = new Thickness(0, 3, 0, 3) };
|
||||
row.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
|
||||
row.ColumnDefinitions.Add(new ColumnDefinition { Width = GridLength.Auto });
|
||||
var lbl = new TextBlock { Text = label, FontSize = 12, Foreground = secondary };
|
||||
var val = new TextBlock { Text = value, FontSize = 12, FontWeight = FontWeights.Medium,
|
||||
Foreground = highlight ? new SolidColorBrush(Color.FromRgb(0x4C, 0xAF, 0x50)) : text };
|
||||
Grid.SetColumn(lbl, 0);
|
||||
Grid.SetColumn(val, 1);
|
||||
row.Children.Add(lbl);
|
||||
row.Children.Add(val);
|
||||
return row;
|
||||
}
|
||||
|
||||
var contentPanel = new StackPanel { Margin = new Thickness(12, 10, 12, 10) };
|
||||
contentPanel.Children.Add(MakeRow("Spent", $"{currency} {spent:F2}", spent > 0));
|
||||
if (unlimited) contentPanel.Children.Add(MakeRow("Limit", "Unlimited"));
|
||||
else if (limit > 0) contentPanel.Children.Add(MakeRow("Limit", $"{currency} {limit:F2}"));
|
||||
if (balance > 0) contentPanel.Children.Add(MakeRow("Balance", $"{currency} {balance:F2}"));
|
||||
|
||||
if (limit > 0)
|
||||
{
|
||||
var pct = Math.Min(spent / limit * 100, 100);
|
||||
contentPanel.Children.Add(new ProgressBar
|
||||
{
|
||||
Value = pct, Maximum = 100, Height = 4,
|
||||
Margin = new Thickness(0, 6, 0, 0),
|
||||
Foreground = accent,
|
||||
Background = new SolidColorBrush(Color.FromArgb(20, 0, 0, 0)),
|
||||
BorderThickness = new Thickness(0),
|
||||
});
|
||||
}
|
||||
|
||||
var card = new Border
|
||||
{
|
||||
Background = (SolidColorBrush)Application.Current.Resources["CardBrush"],
|
||||
CornerRadius = new CornerRadius(6),
|
||||
BorderBrush = border,
|
||||
BorderThickness = new Thickness(1),
|
||||
Margin = new Thickness(12, 0, 12, 0),
|
||||
Child = contentPanel,
|
||||
};
|
||||
|
||||
var sectionLabel = new TextBlock
|
||||
{
|
||||
Text = "EXTRA USAGE CREDITS",
|
||||
Style = (Style)Application.Current.Resources["HeaderText"],
|
||||
Margin = new Thickness(16, 12, 16, 6),
|
||||
};
|
||||
|
||||
var section = new StackPanel();
|
||||
section.Children.Add(sectionLabel);
|
||||
section.Children.Add(card);
|
||||
return section;
|
||||
}
|
||||
|
||||
// ── State updates ────────────────────────────────────────────────
|
||||
|
||||
private void OnVmChanged(string? prop)
|
||||
{
|
||||
if (prop is nameof(UsageViewModel.Limits) or nameof(UsageViewModel.IsLoading)
|
||||
or nameof(UsageViewModel.LastUpdated) or nameof(UsageViewModel.ErrorMessage))
|
||||
or nameof(UsageViewModel.LastUpdated) or nameof(UsageViewModel.ErrorMessage)
|
||||
or nameof(UsageViewModel.ExtraUsage) or nameof(UsageViewModel.Overage) or nameof(UsageViewModel.Prepaid))
|
||||
{
|
||||
RebuildCards();
|
||||
UpdateFooter();
|
||||
@@ -199,7 +357,10 @@ public partial class PopupWindow : Window
|
||||
private void OnUpdaterChanged(string? prop)
|
||||
{
|
||||
if (prop is nameof(UpdateManager.UpdateAvailable) or nameof(UpdateManager.LatestVersion))
|
||||
{
|
||||
UpdateBannerState();
|
||||
UpdateAboutSection();
|
||||
}
|
||||
if (prop is nameof(UpdateManager.DownloadProgress))
|
||||
UpdateProgress.Value = Updater.DownloadProgress * 100;
|
||||
if (prop is nameof(UpdateManager.StatusMessage))
|
||||
@@ -208,6 +369,21 @@ public partial class PopupWindow : Window
|
||||
InstallButton.Visibility = Visibility.Collapsed;
|
||||
}
|
||||
|
||||
private void UpdateAboutSection()
|
||||
{
|
||||
if (Updater.UpdateAvailable)
|
||||
{
|
||||
UpdateAvailableText.Text = $"v{Updater.LatestVersion} available";
|
||||
UpdateAvailableText.Visibility = Visibility.Visible;
|
||||
CheckUpdateButton.Content = "Install";
|
||||
}
|
||||
else
|
||||
{
|
||||
UpdateAvailableText.Visibility = Visibility.Collapsed;
|
||||
CheckUpdateButton.Content = "Check";
|
||||
}
|
||||
}
|
||||
|
||||
private void UpdateBannerState()
|
||||
{
|
||||
var visible = Updater.UpdateAvailable;
|
||||
@@ -232,18 +408,35 @@ public partial class PopupWindow : Window
|
||||
|
||||
// ── Settings ─────────────────────────────────────────────────────
|
||||
|
||||
private static readonly (string Label, int Seconds)[] RefreshIntervals =
|
||||
[
|
||||
("1 min", 60),
|
||||
("2 min", 120),
|
||||
("3 min", 180),
|
||||
("4 min", 240),
|
||||
("5 min", 300),
|
||||
("10 min", 600),
|
||||
];
|
||||
|
||||
private void InitSettings()
|
||||
{
|
||||
VersionLabel.Text = $"v{Updater.CurrentVersion}";
|
||||
BetaToggle.IsChecked = Updater.BetaChannel;
|
||||
CheckUpdateButton.Content = Updater.UpdateAvailable ? "Install" : "Check";
|
||||
UpdateAboutSection();
|
||||
|
||||
var intervals = new[] { ("1 min", 60), ("2 min", 120), ("3 min", 180),
|
||||
("4 min", 240), ("5 min", 300), ("10 min", 600) };
|
||||
RefreshPicker.ItemsSource = intervals;
|
||||
RefreshPicker.DisplayMemberPath = "Item1";
|
||||
var idx = Array.FindIndex(intervals, x => x.Item2 == VM.RefreshInterval);
|
||||
RefreshPicker.SelectedIndex = idx < 0 ? 1 : idx;
|
||||
// Populate ComboBox with ComboBoxItem — DisplayMemberPath doesn't bind reliably
|
||||
// on ValueTuple at runtime so we build items explicitly.
|
||||
RefreshPicker.SelectionChanged -= RefreshPicker_Changed;
|
||||
RefreshPicker.Items.Clear();
|
||||
int selectIdx = 1; // default: 2 min
|
||||
for (int i = 0; i < RefreshIntervals.Length; i++)
|
||||
{
|
||||
var (label, seconds) = RefreshIntervals[i];
|
||||
RefreshPicker.Items.Add(new ComboBoxItem { Content = label, Tag = seconds });
|
||||
if (seconds == VM.RefreshInterval) selectIdx = i;
|
||||
}
|
||||
RefreshPicker.SelectedIndex = selectIdx;
|
||||
RefreshPicker.SelectionChanged += RefreshPicker_Changed;
|
||||
|
||||
AuthPanel.Children.Clear();
|
||||
var dot = new System.Windows.Shapes.Ellipse
|
||||
@@ -252,15 +445,16 @@ public partial class PopupWindow : Window
|
||||
Fill = VM.IsSignedIn ? Brushes.LimeGreen : Brushes.Orange,
|
||||
VerticalAlignment = VerticalAlignment.Center,
|
||||
};
|
||||
var label = new TextBlock
|
||||
var label2 = new TextBlock
|
||||
{
|
||||
Text = VM.IsSignedIn ? $"Signed in — {VM.UserEmail}" : "Not signed in",
|
||||
FontSize = 13, FontWeight = FontWeights.SemiBold, Foreground = Brushes.White,
|
||||
FontSize = 13, FontWeight = FontWeights.SemiBold,
|
||||
Foreground = (SolidColorBrush)Application.Current.Resources["TextBrush"],
|
||||
VerticalAlignment = VerticalAlignment.Center,
|
||||
};
|
||||
var authRow = new StackPanel { Orientation = Orientation.Horizontal };
|
||||
authRow.Children.Add(dot);
|
||||
authRow.Children.Add(label);
|
||||
authRow.Children.Add(label2);
|
||||
AuthPanel.Children.Add(authRow);
|
||||
|
||||
SignOutButton.Visibility = VM.IsSignedIn ? Visibility.Visible : Visibility.Collapsed;
|
||||
@@ -312,14 +506,20 @@ public partial class PopupWindow : Window
|
||||
|
||||
private async void SignIn_Click(object s, RoutedEventArgs e)
|
||||
{
|
||||
_dialogOpen = true;
|
||||
var login = new LoginWindow { Owner = this };
|
||||
if (login.ShowDialog() == true)
|
||||
{
|
||||
await VM.RefreshAsync();
|
||||
await VM.LoadFromCacheAsync();
|
||||
InitSettings();
|
||||
ShowMain();
|
||||
|
||||
_ = Task.Run(async () =>
|
||||
{
|
||||
await Task.Delay(3000);
|
||||
await VM.RefreshAsync();
|
||||
await Application.Current.Dispatcher.InvokeAsync(InitSettings);
|
||||
});
|
||||
}
|
||||
_dialogOpen = false;
|
||||
Show();
|
||||
Activate();
|
||||
}
|
||||
@@ -338,10 +538,10 @@ public partial class PopupWindow : Window
|
||||
|
||||
private void RefreshPicker_Changed(object s, SelectionChangedEventArgs e)
|
||||
{
|
||||
if (RefreshPicker.SelectedItem is ValueTuple<string, int> selected)
|
||||
if (RefreshPicker.SelectedItem is ComboBoxItem item && item.Tag is int seconds)
|
||||
{
|
||||
VM.RefreshInterval = selected.Item2;
|
||||
((App)Application.Current).ScheduleTimer(selected.Item2);
|
||||
VM.RefreshInterval = seconds;
|
||||
((App)Application.Current).ScheduleTimer(seconds);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
## What's new
|
||||
## What's new in beta.36
|
||||
|
||||
Initial Windows release.
|
||||
### Bug fixes
|
||||
- Settings no longer incorrectly shows "Not signed in" when limits are working
|
||||
- Session Diary now shows correctly after the first successful refresh
|
||||
- Extra Usage Credits section now restored from cache on startup
|
||||
- Plan name, overage, and prepaid credits are now cached and shown immediately on launch
|
||||
- App now loads cached state instantly on startup before the background refresh completes
|
||||
|
||||
+13
-11
@@ -2,6 +2,7 @@ using Microsoft.Win32;
|
||||
using System;
|
||||
using System.Windows;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Threading;
|
||||
|
||||
namespace ClaudeCheckerWindows;
|
||||
|
||||
@@ -14,20 +15,17 @@ public static class ThemeManager
|
||||
{
|
||||
IsDark = ReadIsDark();
|
||||
Apply();
|
||||
SystemEvents.UserPreferenceChanged += OnPreferenceChanged;
|
||||
}
|
||||
|
||||
private static void OnPreferenceChanged(object sender, UserPreferenceChangedEventArgs e)
|
||||
{
|
||||
if (e.Category != UserPreferenceCategory.General) return;
|
||||
var nowDark = ReadIsDark();
|
||||
if (nowDark == IsDark) return;
|
||||
IsDark = nowDark;
|
||||
Application.Current.Dispatcher.Invoke(() =>
|
||||
var timer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(5) };
|
||||
timer.Tick += (_, _) =>
|
||||
{
|
||||
var nowDark = ReadIsDark();
|
||||
if (nowDark == IsDark) return;
|
||||
IsDark = nowDark;
|
||||
Apply();
|
||||
ThemeChanged?.Invoke();
|
||||
});
|
||||
};
|
||||
timer.Start();
|
||||
}
|
||||
|
||||
private static bool ReadIsDark()
|
||||
@@ -56,6 +54,8 @@ public static class ThemeManager
|
||||
Set(res, "SurfaceBrush", Color.FromRgb(0x25, 0x25, 0x27));
|
||||
Set(res, "BannerBgBrush", Color.FromRgb(0x1A, 0x31, 0x52));
|
||||
Set(res, "BannerBorderBrush", Color.FromRgb(0x2A, 0x4A, 0x72));
|
||||
Set(res, "HoverBrush", Color.FromRgb(0x4A, 0x4A, 0x4C));
|
||||
Set(res, "BadgeBrush", Color.FromRgb(0x3A, 0x3A, 0x3C));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -69,11 +69,13 @@ public static class ThemeManager
|
||||
Set(res, "SurfaceBrush", Color.FromRgb(0xFA, 0xFA, 0xFA));
|
||||
Set(res, "BannerBgBrush", Color.FromRgb(0xE8, 0xF2, 0xFB));
|
||||
Set(res, "BannerBorderBrush", Color.FromRgb(0xB3, 0xD6, 0xF5));
|
||||
Set(res, "HoverBrush", Color.FromRgb(0xEB, 0xEB, 0xEB));
|
||||
Set(res, "BadgeBrush", Color.FromRgb(0xF0, 0xF0, 0xF0));
|
||||
}
|
||||
}
|
||||
|
||||
private static void Set(ResourceDictionary res, string key, Color color)
|
||||
{
|
||||
if (res[key] is SolidColorBrush b) b.Color = color;
|
||||
res[key] = new SolidColorBrush(color);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Reflection;
|
||||
using System.IO;
|
||||
using System.IO.Compression;
|
||||
using System.Net.Http;
|
||||
@@ -55,7 +56,11 @@ public class UpdateManager : INotifyPropertyChanged
|
||||
|
||||
public string CurrentVersion =>
|
||||
System.Reflection.Assembly.GetExecutingAssembly()
|
||||
.GetName().Version?.ToString(3) ?? "1.0.0";
|
||||
.GetCustomAttribute<System.Reflection.AssemblyInformationalVersionAttribute>()
|
||||
?.InformationalVersion.Split('+')[0]
|
||||
?? "1.0.0";
|
||||
|
||||
private bool IsPreReleaseBuild => CurrentVersion.Contains('-');
|
||||
|
||||
public UpdateManager()
|
||||
{
|
||||
@@ -91,7 +96,8 @@ public class UpdateManager : INotifyPropertyChanged
|
||||
LatestBetaVersion = beta.Version;
|
||||
BetaAvailable = true;
|
||||
|
||||
if (BetaChannel && IsNewer(beta.Version, LatestVersion))
|
||||
// Show beta update if user opted in, or if they're already running a beta
|
||||
if ((BetaChannel || IsPreReleaseBuild) && IsNewer(beta.Version, LatestVersion))
|
||||
{
|
||||
LatestVersion = beta.Version;
|
||||
ReleaseNotes = beta.Notes ?? "";
|
||||
|
||||
+271
-33
@@ -13,7 +13,6 @@ namespace ClaudeCheckerWindows;
|
||||
|
||||
public class UsageViewModel : INotifyPropertyChanged
|
||||
{
|
||||
private static readonly string OrgId = "daf626a9-4924-4ff3-ba98-23b523062f8e";
|
||||
private static readonly JsonSerializerOptions JsonOpts = new() { PropertyNameCaseInsensitive = true };
|
||||
|
||||
private List<AgentLimit> _limits = [];
|
||||
@@ -21,10 +20,11 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
private string? _errorMessage;
|
||||
private bool _isSignedIn;
|
||||
private string _userEmail = "";
|
||||
private string _planLabel = "Pro";
|
||||
private string _planLabel = "Claude";
|
||||
private DateTime? _lastUpdated;
|
||||
private OverageSpendLimit? _overage;
|
||||
private PrepaidCredits? _prepaid;
|
||||
private ExtraUsage? _extraUsage;
|
||||
|
||||
private readonly Dictionary<string, List<double>> _burnHistory = [];
|
||||
private const int MaxHistorySamples = 24;
|
||||
@@ -38,6 +38,7 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
public DateTime? LastUpdated { get => _lastUpdated; set => Set(ref _lastUpdated, value); }
|
||||
public OverageSpendLimit? Overage { get => _overage; set => Set(ref _overage, value); }
|
||||
public PrepaidCredits? Prepaid { get => _prepaid; set => Set(ref _prepaid, value); }
|
||||
public ExtraUsage? ExtraUsage { get => _extraUsage; set => Set(ref _extraUsage, value); }
|
||||
|
||||
private int _refreshInterval = 120;
|
||||
public int RefreshInterval
|
||||
@@ -78,29 +79,56 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
|
||||
try
|
||||
{
|
||||
var cookies = await GetCookiesAsync();
|
||||
if (cookies.Count == 0)
|
||||
// CookieStore being non-empty is our signal that the user has signed in.
|
||||
if (string.IsNullOrEmpty(AppSettings.Default.CookieStore))
|
||||
{
|
||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
IsSignedIn = false;
|
||||
IsSignedIn = false;
|
||||
ErrorMessage = "Not signed in — click Sign In to authenticate.";
|
||||
IsLoading = false;
|
||||
IsLoading = false;
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
using var http = BuildClient(cookies);
|
||||
List<AgentLimit> limits = [];
|
||||
OverageSpendLimit? overage = null;
|
||||
PrepaidCredits? prepaid = null;
|
||||
ExtraUsage? extraUsage = null;
|
||||
string? email = null, orgId = null, planLabel = null;
|
||||
string? refreshError = null;
|
||||
|
||||
var usageTask = FetchAsync<UsageResponse>(http, $"https://claude.ai/api/organizations/{OrgId}/usage");
|
||||
var overageTask = FetchAsync<OverageSpendLimit>(http, $"https://claude.ai/api/organizations/{OrgId}/overage_spend_limit");
|
||||
var prepaidTask = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{OrgId}/prepaid/credits");
|
||||
var emailTask = FetchEmailAsync(http);
|
||||
|
||||
await Task.WhenAll(usageTask, overageTask, prepaidTask, emailTask);
|
||||
|
||||
var usage = usageTask.Result;
|
||||
var limits = BuildLimits(usage);
|
||||
// Primary: persistent background WebView2 — always-live cookies, same as macOS.
|
||||
// Fallback: HttpClient with saved cookies, only if the browser isn't ready yet
|
||||
// (the brief window while InitAsync is still navigating at startup).
|
||||
if (App.BackgroundBrowser.IsReady)
|
||||
{
|
||||
try
|
||||
{
|
||||
(limits, overage, prepaid, extraUsage, email, orgId, planLabel) =
|
||||
await TryBrowserRefreshAsync();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
refreshError = ex.Message;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var cookies = await GetCookiesAsync();
|
||||
if (cookies.Count > 0)
|
||||
{
|
||||
try
|
||||
{
|
||||
(limits, overage, prepaid, extraUsage, email, orgId, planLabel, _) =
|
||||
await TryHttpRefreshAsync(cookies);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
refreshError = ex.Message;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var limit in limits)
|
||||
{
|
||||
@@ -115,14 +143,19 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
|
||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
Limits = limits;
|
||||
Overage = overageTask.Result;
|
||||
Prepaid = prepaidTask.Result;
|
||||
UserEmail = emailTask.Result ?? UserEmail;
|
||||
IsSignedIn = true;
|
||||
ErrorMessage = null;
|
||||
LastUpdated = DateTime.Now;
|
||||
IsLoading = false;
|
||||
if (limits.Count > 0)
|
||||
{
|
||||
Limits = limits;
|
||||
Overage = overage;
|
||||
Prepaid = prepaid;
|
||||
if (extraUsage != null) ExtraUsage = extraUsage;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(planLabel)) PlanLabel = planLabel;
|
||||
if (!string.IsNullOrEmpty(email)) UserEmail = email;
|
||||
IsSignedIn = true;
|
||||
ErrorMessage = refreshError;
|
||||
LastUpdated = DateTime.Now;
|
||||
IsLoading = false;
|
||||
});
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -135,6 +168,128 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
}
|
||||
}
|
||||
|
||||
// ── Browser-based refresh (primary) ───────────────────────────────────────
|
||||
// Runs JS on the persistent claude.ai page. Same live cookies as macOS WKWebView.
|
||||
|
||||
private async Task<(List<AgentLimit>, OverageSpendLimit?, PrepaidCredits?, ExtraUsage?, string?, string?, string?)>
|
||||
TryBrowserRefreshAsync()
|
||||
{
|
||||
const string script = @"(async()=>{try{
|
||||
const h={headers:{accept:'application/json'}};
|
||||
const b=await(await fetch('/api/bootstrap',h)).json();
|
||||
if(b?.error_type==='authentication_error'){window.chrome.webview.postMessage({authError:true});return;}
|
||||
const org0=b?.account?.memberships?.[0]?.organization;
|
||||
let id=org0?.uuid||b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid||null;
|
||||
const email=b?.account?.email_address||b?.account?.email||null;
|
||||
const caps=org0?.capabilities||[];
|
||||
const capStr=caps.find(c=>typeof c==='string'&&c.startsWith('claude_'))||null;
|
||||
const planLabel=capStr?(capStr.slice(7,8).toUpperCase()+capStr.slice(8).toLowerCase()):null;
|
||||
if(!id){
|
||||
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(!id){window.chrome.webview.postMessage({noOrg:true,email});return;}
|
||||
const [u,ov,pp]=await Promise.all([
|
||||
fetch('/api/organizations/'+id+'/usage',h).then(r=>r.json()),
|
||||
fetch('/api/organizations/'+id+'/overage_spend_limit',h).then(r=>r.ok?r.json():null).catch(()=>null),
|
||||
fetch('/api/organizations/'+id+'/prepaid/credits',h).then(r=>r.ok?r.json():null).catch(()=>null)
|
||||
]);
|
||||
window.chrome.webview.postMessage({email,orgId:id,planLabel,usage:u,overage:ov,prepaid:pp});
|
||||
}catch(ex){window.chrome.webview.postMessage({error:String(ex)});}})()";
|
||||
|
||||
var json = await Application.Current.Dispatcher.InvokeAsync(
|
||||
() => App.BackgroundBrowser.RunScriptAsync(script)).Task.Unwrap();
|
||||
|
||||
if (string.IsNullOrEmpty(json) || json == "null")
|
||||
throw new Exception("Browser refresh returned no data.");
|
||||
|
||||
using var doc = JsonDocument.Parse(json);
|
||||
var root = doc.RootElement;
|
||||
|
||||
if (root.TryGetProperty("authError", out _))
|
||||
throw new Exception("Session expired — please re-authenticate.");
|
||||
if (root.TryGetProperty("error", out var errEl))
|
||||
throw new Exception("Browser script error: " + errEl.GetString());
|
||||
if (root.TryGetProperty("noOrg", out _))
|
||||
throw new Exception("Could not determine organization ID.");
|
||||
|
||||
string? email = root.TryGetProperty("email", out var em) && em.ValueKind == JsonValueKind.String ? em.GetString() : null;
|
||||
string? orgId = root.TryGetProperty("orgId", out var oi) && oi.ValueKind == JsonValueKind.String ? oi.GetString() : null;
|
||||
string? planLabel = root.TryGetProperty("planLabel", out var pl) && pl.ValueKind == JsonValueKind.String ? pl.GetString() : null;
|
||||
|
||||
UsageResponse? usage = null;
|
||||
OverageSpendLimit? overage = null;
|
||||
PrepaidCredits? prepaid = null;
|
||||
|
||||
if (root.TryGetProperty("usage", out var us) && us.ValueKind == JsonValueKind.Object)
|
||||
usage = JsonSerializer.Deserialize<UsageResponse>(us.GetRawText(), JsonOpts);
|
||||
if (root.TryGetProperty("overage", out var ov) && ov.ValueKind == JsonValueKind.Object)
|
||||
overage = JsonSerializer.Deserialize<OverageSpendLimit>(ov.GetRawText(), JsonOpts);
|
||||
if (root.TryGetProperty("prepaid", out var pp) && pp.ValueKind == JsonValueKind.Object)
|
||||
prepaid = JsonSerializer.Deserialize<PrepaidCredits>(pp.GetRawText(), JsonOpts);
|
||||
|
||||
return (BuildLimits(usage), overage, prepaid, usage?.ExtraUsage, email, orgId, planLabel);
|
||||
}
|
||||
|
||||
// ── HttpClient refresh (fallback — before browser is ready) ──────────────
|
||||
|
||||
private async Task<(List<AgentLimit>, OverageSpendLimit?, PrepaidCredits?, ExtraUsage?, string?, string?, string?, bool)>
|
||||
TryHttpRefreshAsync(List<(string Name, string Value, string Domain, string Path)> cookies)
|
||||
{
|
||||
using var http = BuildClient(cookies);
|
||||
var bootstrapResp = await http.GetAsync("https://claude.ai/api/bootstrap");
|
||||
if ((int)bootstrapResp.StatusCode is 401 or 403)
|
||||
throw new Exception("Session expired — please re-authenticate.");
|
||||
if (!bootstrapResp.IsSuccessStatusCode)
|
||||
throw new Exception($"Bootstrap failed ({(int)bootstrapResp.StatusCode}).");
|
||||
|
||||
var bootstrapJson = await bootstrapResp.Content.ReadAsStringAsync();
|
||||
var (email, orgId, planLabel) = ParseBootstrap(bootstrapJson);
|
||||
|
||||
if (string.IsNullOrEmpty(orgId))
|
||||
orgId = await FetchOrgIdFromListAsync(http);
|
||||
|
||||
if (string.IsNullOrEmpty(orgId))
|
||||
return ([], null, null, null, email, orgId, planLabel, true);
|
||||
|
||||
var ut = http.GetAsync($"https://claude.ai/api/organizations/{orgId}/usage");
|
||||
var ot = FetchAsync<OverageSpendLimit>(http, $"https://claude.ai/api/organizations/{orgId}/overage_spend_limit");
|
||||
var pt = FetchAsync<PrepaidCredits>(http, $"https://claude.ai/api/organizations/{orgId}/prepaid/credits");
|
||||
await Task.WhenAll(ut, ot, pt);
|
||||
|
||||
var usageResp = ut.Result;
|
||||
if (!usageResp.IsSuccessStatusCode)
|
||||
throw new Exception($"Usage fetch failed ({(int)usageResp.StatusCode}).");
|
||||
|
||||
var usageJson = await usageResp.Content.ReadAsStringAsync();
|
||||
var usage = JsonSerializer.Deserialize<UsageResponse>(usageJson, JsonOpts);
|
||||
|
||||
return (BuildLimits(usage), ot.Result, pt.Result, usage?.ExtraUsage, email, orgId, planLabel, true);
|
||||
}
|
||||
|
||||
// ── Startup cache ─────────────────────────────────────────────────────────
|
||||
// Called before the browser is ready. Sets sign-in state and shows placeholders
|
||||
// with any previously accumulated burn history so the popup isn't blank.
|
||||
|
||||
public async Task LoadFromCacheAsync()
|
||||
{
|
||||
if (string.IsNullOrEmpty(AppSettings.Default.CookieStore)) return;
|
||||
|
||||
var placeholders = LoadPlaceholderLimits();
|
||||
foreach (var limit in placeholders)
|
||||
{
|
||||
var key = limit.Window.ToString();
|
||||
if (_burnHistory.TryGetValue(key, out var hist) && hist.Count > 0)
|
||||
limit.BurnHistory = [.. hist];
|
||||
}
|
||||
|
||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
Limits = placeholders;
|
||||
IsSignedIn = true;
|
||||
});
|
||||
}
|
||||
|
||||
public async Task SignOutAsync()
|
||||
{
|
||||
AppSettings.Default.CookieStore = "";
|
||||
@@ -144,12 +299,12 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
{
|
||||
IsSignedIn = false;
|
||||
UserEmail = "";
|
||||
PlanLabel = "Claude";
|
||||
ErrorMessage = "Signed out.";
|
||||
Limits = [];
|
||||
});
|
||||
}
|
||||
|
||||
// Cookie store: we persist cookies as JSON in settings after login
|
||||
public static async Task<List<(string Name, string Value, string Domain, string Path)>> GetCookiesAsync()
|
||||
{
|
||||
var raw = AppSettings.Default.CookieStore;
|
||||
@@ -166,7 +321,7 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
public static void SaveCookies(IEnumerable<CoreWebView2Cookie> cookies)
|
||||
{
|
||||
var entries = cookies
|
||||
.Where(c => c.Domain.Contains("claude.ai"))
|
||||
.Where(c => c.Domain.Contains("claude.ai") || c.Domain.Contains("anthropic.com"))
|
||||
.Select(c => new CookieEntry { Name = c.Name, Value = c.Value, Domain = c.Domain, Path = c.Path })
|
||||
.ToList();
|
||||
AppSettings.Default.CookieStore = JsonSerializer.Serialize(entries);
|
||||
@@ -178,6 +333,17 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
var handler = new HttpClientHandler { UseCookies = false };
|
||||
var http = new HttpClient(handler);
|
||||
http.DefaultRequestHeaders.Add("accept", "application/json");
|
||||
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;
|
||||
@@ -195,20 +361,90 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
catch { return null; }
|
||||
}
|
||||
|
||||
private static async Task<string?> FetchEmailAsync(HttpClient http)
|
||||
private static (string? Email, string? OrgId, string? PlanLabel) ParseBootstrap(string json)
|
||||
{
|
||||
try
|
||||
{
|
||||
var resp = await http.GetAsync("https://claude.ai/api/bootstrap");
|
||||
using var doc = JsonDocument.Parse(json);
|
||||
var root = doc.RootElement;
|
||||
|
||||
string? email = null;
|
||||
string? orgId = null;
|
||||
|
||||
if (root.TryGetProperty("account", out var acct) &&
|
||||
acct.TryGetProperty("email_address", out var em))
|
||||
email = em.GetString();
|
||||
|
||||
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) &&
|
||||
org.TryGetProperty("uuid", out var uuid))
|
||||
orgId = uuid.GetString();
|
||||
}
|
||||
|
||||
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();
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(orgId) &&
|
||||
root.TryGetProperty("organizations", out var orgs) && orgs.GetArrayLength() > 0)
|
||||
{
|
||||
if (orgs[0].TryGetProperty("uuid", out var uuid))
|
||||
orgId = uuid.GetString();
|
||||
}
|
||||
|
||||
string? planLabel = null;
|
||||
if (root.TryGetProperty("account", out var acctPlan) &&
|
||||
acctPlan.TryGetProperty("memberships", out var plMems) && plMems.GetArrayLength() > 0 &&
|
||||
plMems[0].TryGetProperty("organization", out var plOrg) &&
|
||||
plOrg.TryGetProperty("capabilities", out var caps) &&
|
||||
caps.ValueKind == JsonValueKind.Array)
|
||||
{
|
||||
foreach (var cap in caps.EnumerateArray())
|
||||
{
|
||||
var s = cap.GetString() ?? "";
|
||||
if (s.StartsWith("claude_", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
var name = s.Substring("claude_".Length);
|
||||
if (name.Length > 0)
|
||||
planLabel = char.ToUpper(name[0]) + name.Substring(1).ToLower();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return (email, orgId, planLabel);
|
||||
}
|
||||
catch { return (null, null, null); }
|
||||
}
|
||||
|
||||
private static async Task<string?> FetchOrgIdFromListAsync(HttpClient http)
|
||||
{
|
||||
try
|
||||
{
|
||||
var resp = await http.GetAsync("https://claude.ai/api/organizations");
|
||||
if (!resp.IsSuccessStatusCode) return null;
|
||||
var json = await resp.Content.ReadAsStringAsync();
|
||||
var boot = JsonSerializer.Deserialize<BootstrapResponse>(json, JsonOpts);
|
||||
return boot?.Account?.EmailAddress;
|
||||
using var doc = JsonDocument.Parse(json);
|
||||
var root = doc.RootElement;
|
||||
if (root.ValueKind == JsonValueKind.Array && root.GetArrayLength() > 0)
|
||||
{
|
||||
var first = root[0];
|
||||
if (first.TryGetProperty("uuid", out var uuid))
|
||||
return uuid.GetString();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
catch { return null; }
|
||||
}
|
||||
|
||||
private List<AgentLimit> BuildLimits(UsageResponse? usage)
|
||||
private static List<AgentLimit> BuildLimits(UsageResponse? usage)
|
||||
{
|
||||
if (usage == null) return [];
|
||||
var now = DateTime.Now;
|
||||
@@ -263,16 +499,18 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
return $"{diff.Hours}h {diff.Minutes}m";
|
||||
}
|
||||
|
||||
private void LoadPlaceholders()
|
||||
private static List<AgentLimit> LoadPlaceholderLimits()
|
||||
{
|
||||
var now = DateTime.Now;
|
||||
Limits =
|
||||
return
|
||||
[
|
||||
new() { Window = WindowKind.FiveHour, UsedPercent = 0, TimeRemaining = "—", ResetDate = now.AddHours(1) },
|
||||
new() { Window = WindowKind.SevenDay, UsedPercent = 0, TimeRemaining = "—", ResetDate = now.AddDays(7) },
|
||||
];
|
||||
}
|
||||
|
||||
private void LoadPlaceholders() => Limits = LoadPlaceholderLimits();
|
||||
|
||||
private void LoadBurnHistory()
|
||||
{
|
||||
try
|
||||
|
||||
@@ -0,0 +1,145 @@
|
||||
using Microsoft.Web.WebView2.Core;
|
||||
using Microsoft.Web.WebView2.Wpf;
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
|
||||
namespace ClaudeCheckerWindows;
|
||||
|
||||
// Invisible 1×1 window that hosts a WebView2 for authenticated API calls.
|
||||
// Uses the same user data folder as LoginWindow so the session (including
|
||||
// cf_clearance) is always shared and fresh — equivalent to macOS's WKWebsiteDataStore.
|
||||
//
|
||||
// Two usage modes:
|
||||
// • Persistent (App.BackgroundBrowser): created once at startup, navigates to
|
||||
// claude.ai once, then scripts run directly on the live page every refresh.
|
||||
// No re-navigation = no memory accumulation.
|
||||
// • One-shot (LoginWindow): created, used, closed — same as before.
|
||||
public sealed class WebViewFetchWindow : Window
|
||||
{
|
||||
private readonly WebView2 _wv = new();
|
||||
private bool _initialized;
|
||||
private bool _readyForScript; // true after first navigation to claude.ai completes
|
||||
|
||||
private static readonly string UserDataFolder =
|
||||
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
|
||||
"ClaudeChecker", "WebView2");
|
||||
|
||||
public bool IsReady => _readyForScript;
|
||||
|
||||
public WebViewFetchWindow()
|
||||
{
|
||||
Width = 1;
|
||||
Height = 1;
|
||||
Left = -9999;
|
||||
Top = -9999;
|
||||
ShowInTaskbar = false;
|
||||
WindowStyle = WindowStyle.None;
|
||||
AllowsTransparency = true;
|
||||
Opacity = 0;
|
||||
Content = _wv;
|
||||
}
|
||||
|
||||
// ── Persistent-mode init ──────────────────────────────────────────────────
|
||||
|
||||
// Call once at startup. Navigates to claude.ai so the session/cookies are
|
||||
// established and cf_clearance is fresh. Subsequent RunScriptAsync calls
|
||||
// skip navigation and just execute JS on the live page.
|
||||
public async Task InitAsync()
|
||||
{
|
||||
await EnsureInitAsync();
|
||||
|
||||
var navDone = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
EventHandler<CoreWebView2NavigationCompletedEventArgs>? h = null;
|
||||
h = (_, e) => { _wv.CoreWebView2.NavigationCompleted -= h; navDone.TrySetResult(e.IsSuccess); };
|
||||
_wv.CoreWebView2.NavigationCompleted += h;
|
||||
_wv.CoreWebView2.Navigate("https://claude.ai");
|
||||
|
||||
// Wait up to 15 s for initial navigation
|
||||
await Task.WhenAny(navDone.Task, Task.Delay(15000));
|
||||
_readyForScript = navDone.Task.IsCompletedSuccessfully && navDone.Task.Result;
|
||||
}
|
||||
|
||||
// Run a JS script on the already-loaded claude.ai page.
|
||||
// The script must call window.chrome.webview.postMessage(result).
|
||||
public async Task<string?> RunScriptAsync(string script, int timeoutMs = 10000)
|
||||
{
|
||||
if (!_readyForScript) return null;
|
||||
|
||||
var tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
EventHandler<CoreWebView2WebMessageReceivedEventArgs>? msgHandler = null;
|
||||
msgHandler = (_, args) =>
|
||||
{
|
||||
_wv.CoreWebView2.WebMessageReceived -= msgHandler;
|
||||
tcs.TrySetResult(args.WebMessageAsJson);
|
||||
};
|
||||
_wv.CoreWebView2.WebMessageReceived += msgHandler;
|
||||
|
||||
try { await _wv.CoreWebView2.ExecuteScriptAsync(script); }
|
||||
catch
|
||||
{
|
||||
_wv.CoreWebView2.WebMessageReceived -= msgHandler;
|
||||
return null;
|
||||
}
|
||||
|
||||
_ = Task.Delay(timeoutMs).ContinueWith(_ =>
|
||||
{
|
||||
_wv.CoreWebView2.WebMessageReceived -= msgHandler;
|
||||
tcs.TrySetResult(null);
|
||||
});
|
||||
|
||||
return await tcs.Task;
|
||||
}
|
||||
|
||||
// ── One-shot mode (LoginWindow) ───────────────────────────────────────────
|
||||
|
||||
public async Task<string?> FetchAsync(string navigateUrl, string script, int timeoutMs = 20000)
|
||||
{
|
||||
await EnsureInitAsync();
|
||||
|
||||
var tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
|
||||
|
||||
EventHandler<CoreWebView2WebMessageReceivedEventArgs>? msgHandler = null;
|
||||
msgHandler = (_, args) =>
|
||||
{
|
||||
_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 { await _wv.CoreWebView2.ExecuteScriptAsync(script); }
|
||||
catch { tcs.TrySetResult(null); }
|
||||
};
|
||||
_wv.CoreWebView2.NavigationCompleted += navHandler;
|
||||
_wv.CoreWebView2.Navigate(navigateUrl);
|
||||
|
||||
_ = Task.Delay(timeoutMs).ContinueWith(_ =>
|
||||
{
|
||||
_wv.CoreWebView2.WebMessageReceived -= msgHandler;
|
||||
tcs.TrySetResult(null);
|
||||
});
|
||||
|
||||
return await tcs.Task;
|
||||
}
|
||||
|
||||
// ── Shared init ───────────────────────────────────────────────────────────
|
||||
|
||||
private int _initGuard;
|
||||
|
||||
private async Task EnsureInitAsync()
|
||||
{
|
||||
if (_initialized) return;
|
||||
if (Interlocked.Exchange(ref _initGuard, 1) != 0) return;
|
||||
|
||||
var env = await CoreWebView2Environment.CreateAsync(userDataFolder: UserDataFolder);
|
||||
await _wv.EnsureCoreWebView2Async(env);
|
||||
_initialized = true;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user