Compare commits
18
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0aa8837b2f | ||
|
|
373ca1dc14 | ||
|
|
7a4c21768f | ||
|
|
7b26629dc7 | ||
|
|
e446ea97f9 | ||
|
|
36af325e2d | ||
|
|
e2ef8b6f2a | ||
|
|
7a4975fa3e | ||
|
|
c9912f8463 | ||
|
|
238614a94b | ||
|
|
b11507221f | ||
|
|
b6fef53264 | ||
|
|
ec6ae6621a | ||
|
|
105a7706fa | ||
|
|
a950392a6f | ||
|
|
8087cc029d | ||
|
|
11f9e0c9b6 | ||
|
|
cc835ee2b0 |
@@ -15,9 +15,9 @@
|
|||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>1.2.1-beta.12</string>
|
<string>1.2.1-beta.16</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>60</string>
|
<string>64</string>
|
||||||
<key>LSMinimumSystemVersion</key>
|
<key>LSMinimumSystemVersion</key>
|
||||||
<string>13.0</string>
|
<string>13.0</string>
|
||||||
<key>LSUIElement</key>
|
<key>LSUIElement</key>
|
||||||
|
|||||||
@@ -39,6 +39,9 @@ struct LoginWebView: NSViewRepresentable {
|
|||||||
|
|
||||||
func checkCurrentURL(_ url: String?) {
|
func checkCurrentURL(_ url: String?) {
|
||||||
guard !didAuthenticate, let url else { return }
|
guard !didAuthenticate, let url else { return }
|
||||||
|
// Ignore navigations to external OAuth providers (Google, etc.) —
|
||||||
|
// only consider auth complete when we land back on claude.ai/anthropic.com
|
||||||
|
guard url.contains("claude.ai") || url.contains("anthropic.com") else { return }
|
||||||
if url.contains("/login") || url.contains("/auth") { return }
|
if url.contains("/login") || url.contains("/auth") { return }
|
||||||
didAuthenticate = true
|
didAuthenticate = true
|
||||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
|
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
|
||||||
|
|||||||
@@ -30,9 +30,14 @@ class UsageViewModel: ObservableObject {
|
|||||||
private var previousPercents: [String: Double] = [:]
|
private var previousPercents: [String: Double] = [:]
|
||||||
private var firedThresholds: [String: Set<Int>] = [:]
|
private var firedThresholds: [String: Set<Int>] = [:]
|
||||||
|
|
||||||
// Background WKWebView used for all API calls — runs fetch() in the page's auth context
|
// Background WKWebView for API calls via callAsyncJavaScript.
|
||||||
|
// Hosted in a hidden NSWindow — without a window WebKit suspends the WebView
|
||||||
|
// and JS execution stops working, breaking callAsyncJavaScript.
|
||||||
private var apiWebView: WKWebView?
|
private var apiWebView: WKWebView?
|
||||||
private var apiDelegate: APIWebViewDelegate?
|
private var apiDelegate: APIWebViewDelegate?
|
||||||
|
private var apiWindow: NSWindow?
|
||||||
|
private var apiWebViewLoaded = false
|
||||||
|
private var apiReadyContinuations: [CheckedContinuation<Void, Never>] = []
|
||||||
|
|
||||||
init() {
|
init() {
|
||||||
let saved = UserDefaults.standard.double(forKey: "refresh_interval")
|
let saved = UserDefaults.standard.double(forKey: "refresh_interval")
|
||||||
@@ -51,32 +56,67 @@ class UsageViewModel: ObservableObject {
|
|||||||
private func setupAPIWebView() {
|
private func setupAPIWebView() {
|
||||||
let config = WKWebViewConfiguration()
|
let config = WKWebViewConfiguration()
|
||||||
config.websiteDataStore = WKWebsiteDataStore.default()
|
config.websiteDataStore = WKWebsiteDataStore.default()
|
||||||
let wv = WKWebView(frame: CGRect(x: 0, y: 0, width: 1, height: 1), configuration: config)
|
let wv = WKWebView(frame: NSRect(x: 0, y: 0, width: 1, height: 1), configuration: config)
|
||||||
let del = APIWebViewDelegate()
|
let del = APIWebViewDelegate()
|
||||||
|
del.onNavigationEnd = { [weak self] in
|
||||||
|
guard let self else { return }
|
||||||
|
self.apiWebViewLoaded = true
|
||||||
|
self.resumeAPIReadyContinuations()
|
||||||
|
}
|
||||||
wv.navigationDelegate = del
|
wv.navigationDelegate = del
|
||||||
apiWebView = wv
|
apiWebView = wv
|
||||||
apiDelegate = del
|
apiDelegate = del
|
||||||
|
|
||||||
|
// A WKWebView with no window is suspended by macOS — JS execution won't run.
|
||||||
|
// Hosting it in a 1×1 transparent window keeps WebKit's process alive.
|
||||||
|
let window = NSWindow(
|
||||||
|
contentRect: NSRect(x: 0, y: 0, width: 1, height: 1),
|
||||||
|
styleMask: .borderless,
|
||||||
|
backing: .buffered,
|
||||||
|
defer: false)
|
||||||
|
window.alphaValue = 0.0
|
||||||
|
window.ignoresMouseEvents = true
|
||||||
|
window.isReleasedWhenClosed = false
|
||||||
|
window.collectionBehavior = [.canJoinAllSpaces, .stationary, .ignoresCycle]
|
||||||
|
window.contentView?.addSubview(wv)
|
||||||
|
window.orderFrontRegardless()
|
||||||
|
apiWindow = window
|
||||||
|
|
||||||
wv.load(URLRequest(url: URL(string: "https://claude.ai")!))
|
wv.load(URLRequest(url: URL(string: "https://claude.ai")!))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Called after login: reloads the background WebView to pick up the new session, then refreshes.
|
private func resumeAPIReadyContinuations() {
|
||||||
|
let pending = apiReadyContinuations
|
||||||
|
apiReadyContinuations.removeAll()
|
||||||
|
pending.forEach { $0.resume() }
|
||||||
|
}
|
||||||
|
|
||||||
|
private func waitForAPIWebViewReady() async {
|
||||||
|
guard !apiWebViewLoaded else { return }
|
||||||
|
await withCheckedContinuation { cont in
|
||||||
|
apiReadyContinuations.append(cont)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Called after login: reloads the background WebView to pick up the new session.
|
||||||
func reloadAPIWebViewAndRefresh() async {
|
func reloadAPIWebViewAndRefresh() async {
|
||||||
guard let wv = apiWebView, let del = apiDelegate else {
|
guard let wv = apiWebView else {
|
||||||
await refresh()
|
await refresh()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
await withCheckedContinuation { (cont: CheckedContinuation<Void, Never>) in
|
apiWebViewLoaded = false
|
||||||
del.onDidFinish = { cont.resume() }
|
wv.load(URLRequest(url: URL(string: "https://claude.ai")!))
|
||||||
wv.load(URLRequest(url: URL(string: "https://claude.ai")!))
|
await waitForAPIWebViewReady()
|
||||||
}
|
|
||||||
// Brief pause for the page's JS auth state to settle after navigation
|
|
||||||
try? await Task.sleep(nanoseconds: 500_000_000)
|
try? await Task.sleep(nanoseconds: 500_000_000)
|
||||||
await refresh()
|
await refresh()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Runs a fetch() call inside the background WebView's page context (same-origin, credentials included).
|
// Executes a same-origin fetch inside the background WebView's page context.
|
||||||
|
// This includes all credentials the page has (cookies, localStorage tokens, etc.),
|
||||||
|
// which URLSession cannot access — hence using callAsyncJavaScript instead.
|
||||||
private func webViewFetch(_ path: String) async throws -> (statusCode: Int, body: String) {
|
private func webViewFetch(_ path: String) async throws -> (statusCode: Int, body: String) {
|
||||||
guard let wv = apiWebView else { throw AppError.networkError }
|
guard let wv = apiWebView else { throw AppError.networkError }
|
||||||
|
await waitForAPIWebViewReady()
|
||||||
let js = "const r = await fetch(path, {credentials:'include'}); return {s: r.status, b: await r.text()};"
|
let js = "const r = await fetch(path, {credentials:'include'}); return {s: r.status, b: await r.text()};"
|
||||||
let result = try await wv.callAsyncJavaScript(
|
let result = try await wv.callAsyncJavaScript(
|
||||||
js, arguments: ["path": path], in: nil, in: .page)
|
js, arguments: ["path": path], in: nil, in: .page)
|
||||||
@@ -106,7 +146,7 @@ class UsageViewModel: ObservableObject {
|
|||||||
extraUsage = nil
|
extraUsage = nil
|
||||||
prepaidCredits = nil
|
prepaidCredits = nil
|
||||||
overageSpendLimit = nil
|
overageSpendLimit = nil
|
||||||
// Reload background WebView to clear its session too
|
apiWebViewLoaded = false
|
||||||
apiWebView?.load(URLRequest(url: URL(string: "https://claude.ai")!))
|
apiWebView?.load(URLRequest(url: URL(string: "https://claude.ai")!))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -173,7 +213,7 @@ class UsageViewModel: ObservableObject {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// MARK: - Bootstrap (org ID + email + plan label in one call)
|
// MARK: - Bootstrap
|
||||||
|
|
||||||
private func fetchBootstrap() async throws -> (orgId: String?, email: String?, planLabel: String?) {
|
private func fetchBootstrap() async throws -> (orgId: String?, email: String?, planLabel: String?) {
|
||||||
let (status, body) = try await webViewFetch("/api/bootstrap")
|
let (status, body) = try await webViewFetch("/api/bootstrap")
|
||||||
@@ -353,16 +393,16 @@ class UsageViewModel: ObservableObject {
|
|||||||
// MARK: - API WebView Delegate
|
// MARK: - API WebView Delegate
|
||||||
|
|
||||||
private class APIWebViewDelegate: NSObject, WKNavigationDelegate {
|
private class APIWebViewDelegate: NSObject, WKNavigationDelegate {
|
||||||
var onDidFinish: (() -> Void)?
|
var onNavigationEnd: (() -> Void)?
|
||||||
|
|
||||||
func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
|
func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
|
||||||
let cb = onDidFinish; onDidFinish = nil; cb?()
|
onNavigationEnd?()
|
||||||
}
|
}
|
||||||
func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
|
func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
|
||||||
let cb = onDidFinish; onDidFinish = nil; cb?()
|
onNavigationEnd?()
|
||||||
}
|
}
|
||||||
func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
|
func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
|
||||||
let cb = onDidFinish; onDidFinish = nil; cb?()
|
onNavigationEnd?()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
[](https://swift.org)
|
[](https://swift.org)
|
||||||
[](https://github.com/superdooper86/claudechecker/releases)
|
[](https://github.com/superdooper86/claudechecker/releases)
|
||||||
[](LICENSE)
|
[](LICENSE)
|
||||||
[](https://github.com/superdooper86/claudechecker/releases/tag/v1.2.1-beta.11) <!-- BETA_BADGE -->
|
[](https://github.com/superdooper86/claudechecker/releases/tag/v1.2.1-beta.15) <!-- BETA_BADGE -->
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
+5
-9
@@ -1,12 +1,8 @@
|
|||||||
## What's new in v1.2.1
|
## What's new in v1.2.1
|
||||||
|
|
||||||
### Bug fixes
|
### Bug fixes
|
||||||
- Fixed usage data not loading after sign-in — API calls now run inside a persistent background WebView using the page's own fetch(), so all credentials (cookies, localStorage tokens, etc.) are included automatically
|
- Fixed the root cause of "Not signed in" after being clearly signed in: claude.ai's auth requires credentials beyond plain HTTP cookies (localStorage tokens, Service Worker state, etc.) that URLSession cannot access. All API calls now run via callAsyncJavaScript inside a background WKWebView, using the same fetch path the page itself uses — credentials are included automatically.
|
||||||
- Fixed "Not signed in" showing after login — the background WebView is now reloaded after sign-in to pick up the new session before the first data refresh
|
- Fixed WebKit suspending the background WKWebView: a WKWebView with no window is throttled/suspended by macOS, preventing JS execution. The background WebView is now anchored in a transparent 1×1 NSWindow, keeping it active.
|
||||||
- Fixed "Not signed in" showing incorrectly on launch when the session was already active
|
- Fixed login window auto-closing before sign-in completes — login window loads `/login` and only detects auth when back on claude.ai (not on OAuth provider redirects)
|
||||||
- Sign-in state is now detected immediately from stored cookies on startup, before the first data refresh completes
|
- Added `/api/organizations` as a final fallback for org ID resolution
|
||||||
- Fixed login window auto-closing before the user could sign in — the login window now correctly loads the `/login` page so it only detects auth after the actual sign-in redirect
|
- Fixed Settings incorrectly showing "Signed in" after a failed refresh
|
||||||
- Fixed "No API key configured" showing after signing out — now correctly shows "Not signed in" with a prompt to sign in
|
|
||||||
- Added `/api/organizations` as a final fallback for org ID resolution when the bootstrap API response doesn't include it
|
|
||||||
- Fixed Settings incorrectly showing "Signed in" after a failed refresh — sign-in state now resets when authentication fails
|
|
||||||
- Rewrote login detection to use KVO on the WebView URL — correctly detects auth for Next.js SPA navigation (history.pushState) that doesn't trigger didFinish
|
|
||||||
|
|||||||
+3
-3
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"version": "1.2.1-beta.11",
|
"version": "1.2.1-beta.15",
|
||||||
"url": "https://github.com/superdooper86/claudechecker/releases/download/v1.2.1-beta.11/ClaudeChecker.zip",
|
"url": "https://github.com/superdooper86/claudechecker/releases/download/v1.2.1-beta.15/ClaudeChecker.zip",
|
||||||
"notes": "## What's new in v1.2.1\n\n### Bug fixes\n- Fixed \"Not signed in\" showing incorrectly on launch when the session was already active\n- Sign-in state is now detected immediately from stored cookies on startup, before the first data refresh completes\n- Fixed login window auto-closing before the user could sign in — the login window now correctly loads the `/login` page so it only detects auth after the actual sign-in redirect\n- Fixed \"No API key configured\" showing after signing out — now correctly shows \"Not signed in\" with a prompt to sign in\n- Added `/api/organizations` as a final fallback for org ID resolution when the bootstrap API response doesn't include it\n- Fixed usage data not loading — API requests now include required browser-like headers (Origin, Referer, User-Agent)\n- Fixed Settings incorrectly showing \"Signed in\" after a failed refresh — sign-in state now resets when authentication fails\n- Rewrote login detection to use the WebView's own fetch call instead of inspecting cookie domains — correctly detects auth regardless of which domain the session token is stored on\n- Fixed API requests not including session cookies — now sends all cookies from the app's WebView store rather than filtering by domain"
|
"notes": "## What's new in v1.2.1\n\n### Bug fixes\n- Fixed the root cause of \"Not signed in\" errors: URLSession was silently discarding the manually-set Cookie header because `httpShouldHandleCookies` defaults to `true`, which makes URLSession replace it with its own (empty) HTTPCookieStorage — claude.ai session cookies live in WKWebsiteDataStore, not HTTPCookieStorage. Setting `httpShouldHandleCookies = false` ensures the cookies are actually sent.\n- Added browser-like request headers (User-Agent, Origin, Referer) matching what Claude's API expects, consistent with the working Windows implementation\n- Removed background WKWebView complexity added in beta.12–13 — reverted to simple URLSession approach with correct cookie handling\n- Fixed login window auto-closing before the user could sign in — login window loads `/login` so auth is only detected after the actual sign-in redirect\n- Fixed login detection for Next.js SPA navigation using KVO on WebView URL (history.pushState doesn't trigger didFinish)\n- Added `/api/organizations` as a final fallback for org ID resolution\n- Fixed Settings incorrectly showing \"Signed in\" after a failed refresh"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user