Compare commits
49
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e13d3d8ee8 | ||
|
|
a729a37efc | ||
|
|
c7e4c81b9a | ||
|
|
2313c4378a | ||
|
|
c51086c119 | ||
|
|
5840b34b3b | ||
|
|
5a141095e1 | ||
|
|
4b42a631be | ||
|
|
c6d2ed8261 | ||
|
|
747e26e5eb | ||
|
|
b9fd5a27ec | ||
|
|
60336cffa7 | ||
|
|
953c46077c | ||
|
|
3796139178 | ||
|
|
554eb80c0c | ||
|
|
a22bf3a309 | ||
|
|
eaab3eb539 | ||
|
|
323aa174da | ||
|
|
3803cf37f6 | ||
|
|
1977b51b74 | ||
|
|
64a3f15ac5 | ||
|
|
8fbd1c42c3 | ||
|
|
0bf19c3dc8 | ||
|
|
d56a714bb9 | ||
|
|
88f409971a | ||
|
|
9bac2540e8 | ||
|
|
792c5a26e9 | ||
|
|
421727bfb5 | ||
|
|
21b2905bcf | ||
|
|
38d6f2a582 | ||
|
|
7ea5554506 | ||
|
|
87c5992889 | ||
|
|
034e196214 | ||
|
|
2235a627b5 | ||
|
|
d6c138f1a2 | ||
|
|
432819639e | ||
|
|
52db469c13 | ||
|
|
40c86aaaf2 | ||
|
|
46b09934d7 | ||
|
|
a79a23ac24 | ||
|
|
3785629ee4 | ||
|
|
a338f4e5fe | ||
|
|
88e7d684c0 | ||
|
|
9af0d6401c | ||
|
|
7cb2159b4c | ||
|
|
206e97780d | ||
|
|
2b79ba4ae0 | ||
|
|
60b6c60c0a | ||
|
|
8140831236 |
@@ -18,12 +18,18 @@ Steps to reproduce the behaviour:
|
|||||||
**Expected behaviour**
|
**Expected behaviour**
|
||||||
What you expected to happen.
|
What you expected to happen.
|
||||||
|
|
||||||
|
**Diagnostics**
|
||||||
|
Open the app → Settings → Diagnostics, then click "Copy All" and paste the output here.
|
||||||
|
This shows the error, request state, and cookie info. Email and org IDs are automatically redacted when you click Copy All.
|
||||||
|
|
||||||
**Screenshots**
|
**Screenshots**
|
||||||
If applicable, add screenshots to help explain your problem.
|
If applicable, add screenshots to help explain your problem.
|
||||||
|
|
||||||
**Environment**
|
**Environment**
|
||||||
- macOS version: [e.g. Sequoia 15.4]
|
- Platform: [macOS / Windows]
|
||||||
- ClaudeChecker version: [e.g. 1.1.3]
|
- macOS version: [e.g. Sequoia 15.4] *(if applicable)*
|
||||||
|
- Windows version: [e.g. Windows 11 24H2] *(if applicable)*
|
||||||
|
- ClaudeChecker version: [e.g. 1.3.2]
|
||||||
- Claude plan: [e.g. Pro, Max]
|
- Claude plan: [e.g. Pro, Max]
|
||||||
|
|
||||||
**Additional context**
|
**Additional context**
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
shields_version=$(echo "${{ steps.version.outputs.version }}" | sed 's/-/--/g')
|
shields_version=$(echo "${{ steps.version.outputs.version }}" | sed 's/-/--/g')
|
||||||
tag="${{ github.ref_name }}"
|
tag="${{ github.ref_name }}"
|
||||||
export BADGE="[](https://github.com/${{ github.repository }}/releases/tag/${tag}) <!-- BETA_BADGE -->"
|
export BADGE="[](https://github.com/${{ github.repository }}/releases/tag/${tag}) <!-- BETA_BADGE -->"
|
||||||
python3 -c "
|
python3 -c "
|
||||||
import os
|
import os
|
||||||
badge = os.environ['BADGE']
|
badge = os.environ['BADGE']
|
||||||
@@ -75,5 +75,7 @@ jobs:
|
|||||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||||
git add version-beta.json README.md
|
git add version-beta.json README.md
|
||||||
git commit -m "Beta release ${{ github.ref_name }}"
|
git commit -m "Beta release ${{ github.ref_name }}"
|
||||||
git pull --rebase origin main
|
for i in 1 2 3 4 5; do
|
||||||
git push origin HEAD:main
|
git pull --rebase origin main && git push origin HEAD:main && break
|
||||||
|
echo "Push attempt $i failed, retrying..."; sleep 3
|
||||||
|
done
|
||||||
|
|||||||
@@ -73,15 +73,9 @@ jobs:
|
|||||||
import os, re
|
import os, re
|
||||||
v = os.environ['NEW_VERSION']
|
v = os.environ['NEW_VERSION']
|
||||||
content = open('README.md').read()
|
content = open('README.md').read()
|
||||||
content = re.sub(r'version-[0-9][^-]*-orange', 'version-' + v + '-orange', content)
|
content = re.sub(r'macOS_Stable-[^-]+-orange', 'macOS_Stable-' + v + '-orange', content)
|
||||||
lines = content.splitlines(keepends=True)
|
lines = content.splitlines(keepends=True)
|
||||||
out = []
|
out = ['<!-- BETA_BADGE -->' + chr(10) if '<!-- BETA_BADGE -->' in line else line for line in lines]
|
||||||
for line in lines:
|
|
||||||
if '<!-- BETA_BADGE -->' in line:
|
|
||||||
continue
|
|
||||||
out.append(line)
|
|
||||||
if 'license-MIT-blue' in line:
|
|
||||||
out.append('<!-- BETA_BADGE -->' + chr(10))
|
|
||||||
open('README.md', 'w').writelines(out)
|
open('README.md', 'w').writelines(out)
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
@@ -18,16 +18,43 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
|||||||
var updateManager = UpdateManager()
|
var updateManager = UpdateManager()
|
||||||
var refreshTimer: Timer?
|
var refreshTimer: Timer?
|
||||||
var cookiePrimerView: WKWebView?
|
var cookiePrimerView: WKWebView?
|
||||||
|
var cookiePrimerWindow: NSWindow?
|
||||||
|
var primerNavDelegate: PrimerNavDelegate?
|
||||||
var cancellables = Set<AnyCancellable>()
|
var cancellables = Set<AnyCancellable>()
|
||||||
|
|
||||||
func applicationDidFinishLaunching(_ notification: Notification) {
|
func applicationDidFinishLaunching(_ notification: Notification) {
|
||||||
NSApp.setActivationPolicy(.accessory)
|
NSApp.setActivationPolicy(.accessory)
|
||||||
|
|
||||||
// Hidden WKWebView to prime the shared cookie store
|
// Background WebView that loads claude.ai on every launch.
|
||||||
|
// Anchored in a real (off-screen, invisible) NSWindow so WebKit doesn't throttle
|
||||||
|
// JS execution. When the page finishes loading the nav delegate calls
|
||||||
|
// adoptPrimerWebView, which sets it as the API WebView and runs the first fetch.
|
||||||
let config = WKWebViewConfiguration()
|
let config = WKWebViewConfiguration()
|
||||||
config.websiteDataStore = WKWebsiteDataStore.default()
|
config.websiteDataStore = WKWebsiteDataStore.default()
|
||||||
cookiePrimerView = WKWebView(frame: .zero, configuration: config)
|
let wv = WKWebView(frame: CGRect(x: 0, y: 0, width: 1, height: 1), configuration: config)
|
||||||
cookiePrimerView?.load(URLRequest(url: URL(string: "https://claude.ai")!))
|
let win = NSWindow(
|
||||||
|
contentRect: NSRect(x: -9999, y: -9999, width: 1, height: 1),
|
||||||
|
styleMask: [],
|
||||||
|
backing: .buffered,
|
||||||
|
defer: false
|
||||||
|
)
|
||||||
|
win.contentView = wv
|
||||||
|
win.alphaValue = 0
|
||||||
|
win.orderFront(nil)
|
||||||
|
cookiePrimerWindow = win
|
||||||
|
cookiePrimerView = wv
|
||||||
|
|
||||||
|
let delegate = PrimerNavDelegate { [weak self] in
|
||||||
|
guard let self, let wv = self.cookiePrimerView else { return }
|
||||||
|
Task { @MainActor [weak self] in
|
||||||
|
guard let self else { return }
|
||||||
|
await self.usageViewModel.adoptPrimerWebView(wv)
|
||||||
|
await self.updateManager.checkForUpdates()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
primerNavDelegate = delegate
|
||||||
|
wv.navigationDelegate = delegate
|
||||||
|
wv.load(URLRequest(url: URL(string: "https://claude.ai")!))
|
||||||
|
|
||||||
// Status item
|
// Status item
|
||||||
statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
|
statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
|
||||||
@@ -134,12 +161,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Initial fetch after cookie primer + update check
|
|
||||||
Task {
|
|
||||||
try? await Task.sleep(nanoseconds: 1_500_000_000)
|
|
||||||
await usageViewModel.refresh()
|
|
||||||
await updateManager.checkForUpdates()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private func setMenubarIcon(button: NSStatusBarButton) {
|
private func setMenubarIcon(button: NSStatusBarButton) {
|
||||||
@@ -240,4 +261,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// One-shot WKNavigationDelegate: fires onDone on first finish or error, then goes silent.
|
||||||
|
final class PrimerNavDelegate: NSObject, WKNavigationDelegate {
|
||||||
|
private var done = false
|
||||||
|
private let onDone: () -> Void
|
||||||
|
init(_ onDone: @escaping () -> Void) { self.onDone = onDone }
|
||||||
|
private func finish() { guard !done else { return }; done = true; onDone() }
|
||||||
|
func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) { finish() }
|
||||||
|
func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) { finish() }
|
||||||
|
func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) { finish() }
|
||||||
|
}
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ struct DiagnosticsView: View {
|
|||||||
.buttonStyle(.bordered)
|
.buttonStyle(.bordered)
|
||||||
.controlSize(.small)
|
.controlSize(.small)
|
||||||
if copied {
|
if copied {
|
||||||
Text("Copied!")
|
Text("Copied! (IDs redacted)")
|
||||||
.font(.system(size: 11))
|
.font(.system(size: 11))
|
||||||
.foregroundColor(.green)
|
.foregroundColor(.green)
|
||||||
}
|
}
|
||||||
@@ -38,6 +38,15 @@ struct DiagnosticsView: View {
|
|||||||
|
|
||||||
Divider()
|
Divider()
|
||||||
|
|
||||||
|
Text("Org IDs are redacted when copied.")
|
||||||
|
.font(.system(size: 10))
|
||||||
|
.foregroundColor(.secondary)
|
||||||
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
|
.padding(.horizontal, 14)
|
||||||
|
.padding(.vertical, 6)
|
||||||
|
|
||||||
|
Divider()
|
||||||
|
|
||||||
ScrollView {
|
ScrollView {
|
||||||
VStack(alignment: .leading, spacing: 14) {
|
VStack(alignment: .leading, spacing: 14) {
|
||||||
|
|
||||||
@@ -46,7 +55,6 @@ struct DiagnosticsView: View {
|
|||||||
DiagRow("Version", Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "?")
|
DiagRow("Version", Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "?")
|
||||||
DiagRow("Build", Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "?")
|
DiagRow("Build", Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "?")
|
||||||
DiagRow("Signed in", vm.isSignedIn ? "Yes" : "No")
|
DiagRow("Signed in", vm.isSignedIn ? "Yes" : "No")
|
||||||
DiagRow("Email", vm.userEmail.isEmpty ? "(none)" : vm.userEmail)
|
|
||||||
DiagRow("Org ID", UserDefaults.standard.string(forKey: "claude_org_id") ?? "(none)")
|
DiagRow("Org ID", UserDefaults.standard.string(forKey: "claude_org_id") ?? "(none)")
|
||||||
DiagRow("lastActiveOrg", vm.diagLastActiveOrg.isEmpty ? "(not read)" : vm.diagLastActiveOrg)
|
DiagRow("lastActiveOrg", vm.diagLastActiveOrg.isEmpty ? "(not read)" : vm.diagLastActiveOrg)
|
||||||
DiagRow("Error", vm.errorMessage ?? "(none)")
|
DiagRow("Error", vm.errorMessage ?? "(none)")
|
||||||
@@ -66,47 +74,6 @@ struct DiagnosticsView: View {
|
|||||||
|
|
||||||
Divider()
|
Divider()
|
||||||
|
|
||||||
// Bootstrap body
|
|
||||||
if !vm.diagBootstrapBody.isEmpty {
|
|
||||||
DiagSection(title: "Bootstrap Response (first 500 chars)") {
|
|
||||||
Text(vm.diagBootstrapBody)
|
|
||||||
.font(.system(size: 10, design: .monospaced))
|
|
||||||
.foregroundColor(.secondary)
|
|
||||||
.textSelection(.enabled)
|
|
||||||
.frame(maxWidth: .infinity, alignment: .leading)
|
|
||||||
.padding(8)
|
|
||||||
.background(Color.primary.opacity(0.04))
|
|
||||||
.cornerRadius(5)
|
|
||||||
}
|
|
||||||
Divider()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Response body
|
|
||||||
if !vm.diagLastBody.isEmpty {
|
|
||||||
DiagSection(title: "Last API Response (first 500 chars)") {
|
|
||||||
Text(vm.diagLastBody)
|
|
||||||
.font(.system(size: 10, design: .monospaced))
|
|
||||||
.foregroundColor(.secondary)
|
|
||||||
.textSelection(.enabled)
|
|
||||||
.frame(maxWidth: .infinity, alignment: .leading)
|
|
||||||
.padding(8)
|
|
||||||
.background(Color.primary.opacity(0.04))
|
|
||||||
.cornerRadius(5)
|
|
||||||
}
|
|
||||||
Divider()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Cookie summary
|
|
||||||
DiagSection(title: "Cookie Store") {
|
|
||||||
DiagRow("Total cookies", "\(vm.diagCookieCount)")
|
|
||||||
DiagRow("claude.ai cookies", "\(vm.diagClaudeCookieCount)")
|
|
||||||
DiagRow("All domains", vm.diagCookieDomains.isEmpty
|
|
||||||
? "(none — never fetched)"
|
|
||||||
: vm.diagCookieDomains.joined(separator: ", "))
|
|
||||||
}
|
|
||||||
|
|
||||||
Divider()
|
|
||||||
|
|
||||||
// Live cookie list
|
// Live cookie list
|
||||||
DiagSection(title: "Live Cookie Names (WKWebsiteDataStore.default)") {
|
DiagSection(title: "Live Cookie Names (WKWebsiteDataStore.default)") {
|
||||||
if loadingCookies {
|
if loadingCookies {
|
||||||
@@ -174,33 +141,39 @@ struct DiagnosticsView: View {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private var fullDiagText: String {
|
private var fullDiagText: String {
|
||||||
|
let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "?"
|
||||||
|
let build = Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "?"
|
||||||
|
let orgId = UserDefaults.standard.string(forKey: "claude_org_id") ?? "(none)"
|
||||||
|
let lastOrg = vm.diagLastActiveOrg.isEmpty ? "(not read)" : vm.diagLastActiveOrg
|
||||||
|
let lastErr = vm.diagLastError.isEmpty ? "(none)" : vm.diagLastError
|
||||||
var lines: [String] = []
|
var lines: [String] = []
|
||||||
lines.append("=== ClaudeChecker Diagnostics ===")
|
lines.append("=== ClaudeChecker Diagnostics ===")
|
||||||
lines.append("Version: \(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "?") (\(Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "?"))")
|
lines.append("Version: \(version) (\(build))")
|
||||||
lines.append("Signed in: \(vm.isSignedIn ? "Yes" : "No")")
|
lines.append("Signed in: \(vm.isSignedIn ? "Yes" : "No")")
|
||||||
lines.append("Email: \(vm.userEmail.isEmpty ? "(none)" : vm.userEmail)")
|
lines.append("Org ID: \(orgId)")
|
||||||
lines.append("Org ID: \(UserDefaults.standard.string(forKey: "claude_org_id") ?? "(none)")")
|
lines.append("lastActiveOrg: \(lastOrg)")
|
||||||
lines.append("lastActiveOrg: \(vm.diagLastActiveOrg.isEmpty ? "(not read)" : vm.diagLastActiveOrg)")
|
|
||||||
lines.append("Error: \(vm.errorMessage ?? "(none)")")
|
lines.append("Error: \(vm.errorMessage ?? "(none)")")
|
||||||
lines.append("")
|
lines.append("")
|
||||||
lines.append("Last path: \(vm.diagLastPath)")
|
lines.append("Last path: \(vm.diagLastPath)")
|
||||||
lines.append("Last status: \(vm.diagLastStatus)")
|
lines.append("Last status: \(vm.diagLastStatus)")
|
||||||
lines.append("Last error: \(vm.diagLastError)")
|
lines.append("Last error: \(lastErr)")
|
||||||
lines.append("Total cookies: \(vm.diagCookieCount)")
|
if let t = vm.diagLastFetch {
|
||||||
lines.append("Claude cookies: \(vm.diagClaudeCookieCount)")
|
lines.append("Time: \(t.formatted(date: .omitted, time: .standard))")
|
||||||
lines.append("Domains: \(vm.diagCookieDomains.joined(separator: ", "))")
|
}
|
||||||
lines.append("")
|
lines.append("")
|
||||||
lines.append("Bootstrap body:")
|
|
||||||
lines.append(vm.diagBootstrapBody)
|
|
||||||
lines.append("")
|
|
||||||
lines.append("Last API response:")
|
|
||||||
lines.append(vm.diagLastBody)
|
|
||||||
lines.append("")
|
lines.append("")
|
||||||
lines.append("Live cookies:")
|
lines.append("Live cookies:")
|
||||||
for c in liveAllCookies {
|
for c in liveAllCookies {
|
||||||
lines.append(" \(c.domain) \(c.name) httpOnly=\(c.isHTTPOnly) secure=\(c.isSecure)")
|
lines.append(" \(c.domain) \(c.name) httpOnly=\(c.isHTTPOnly) secure=\(c.isSecure)")
|
||||||
}
|
}
|
||||||
return lines.joined(separator: "\n")
|
return redactUUIDs(lines.joined(separator: "\n"))
|
||||||
|
}
|
||||||
|
|
||||||
|
private func redactUUIDs(_ text: String) -> String {
|
||||||
|
let pattern = "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}"
|
||||||
|
guard let regex = try? NSRegularExpression(pattern: pattern) else { return text }
|
||||||
|
let range = NSRange(text.startIndex..., in: text)
|
||||||
|
return regex.stringByReplacingMatches(in: text, range: range, withTemplate: "****")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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.24</string>
|
<string>1.3.3-beta.5</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>72</string>
|
<string>81</string>
|
||||||
<key>LSMinimumSystemVersion</key>
|
<key>LSMinimumSystemVersion</key>
|
||||||
<string>13.0</string>
|
<string>13.0</string>
|
||||||
<key>LSUIElement</key>
|
<key>LSUIElement</key>
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ class UsageViewModel: ObservableObject {
|
|||||||
|
|
||||||
// WebView used for JS-based API calls (avoids URLSession 403 fingerprinting issues)
|
// WebView used for JS-based API calls (avoids URLSession 403 fingerprinting issues)
|
||||||
private var apiWebView: WKWebView?
|
private var apiWebView: WKWebView?
|
||||||
private var navWaiter: WKNavWaiter?
|
|
||||||
|
|
||||||
// Diagnostics
|
// Diagnostics
|
||||||
@Published var diagCookieCount: Int = 0
|
@Published var diagCookieCount: Int = 0
|
||||||
@@ -40,10 +39,8 @@ class UsageViewModel: ObservableObject {
|
|||||||
@Published var diagCookieDomains: [String] = []
|
@Published var diagCookieDomains: [String] = []
|
||||||
@Published var diagLastPath: String = ""
|
@Published var diagLastPath: String = ""
|
||||||
@Published var diagLastStatus: Int = 0
|
@Published var diagLastStatus: Int = 0
|
||||||
@Published var diagLastBody: String = ""
|
|
||||||
@Published var diagLastError: String = ""
|
@Published var diagLastError: String = ""
|
||||||
@Published var diagLastActiveOrg: String = "" // lastActiveOrg cookie value from JS
|
@Published var diagLastActiveOrg: String = "" // lastActiveOrg cookie value from JS
|
||||||
@Published var diagBootstrapBody: String = "" // raw bootstrap response (first 500 chars)
|
|
||||||
@Published var diagLastFetch: Date? = nil
|
@Published var diagLastFetch: Date? = nil
|
||||||
|
|
||||||
init() {
|
init() {
|
||||||
@@ -57,38 +54,24 @@ class UsageViewModel: ObservableObject {
|
|||||||
Task { await checkInitialSignInState() }
|
Task { await checkInitialSignInState() }
|
||||||
}
|
}
|
||||||
|
|
||||||
// Called after login: store the webview (already on claude.ai) so jsFetch can use it.
|
// Called by AppDelegate once the primer WebView has loaded claude.ai.
|
||||||
|
// Sets it as the API WebView and triggers the first data fetch.
|
||||||
|
func adoptPrimerWebView(_ wv: WKWebView) async {
|
||||||
|
apiWebView = wv
|
||||||
|
await refresh()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Called after login: store the login WebView (already on claude.ai) so jsFetch can use it.
|
||||||
func adoptAndRefresh(_ loginWebView: WKWebView) async {
|
func adoptAndRefresh(_ loginWebView: WKWebView) async {
|
||||||
for _ in 0..<30 {
|
for _ in 0..<30 {
|
||||||
let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
|
let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
|
||||||
if cookies.contains(where: { $0.domain.contains("claude.ai") }) { break }
|
if cookies.contains(where: { $0.domain.contains("claude.ai") }) { break }
|
||||||
try? await Task.sleep(nanoseconds: 300_000_000)
|
try? await Task.sleep(nanoseconds: 300_000_000)
|
||||||
}
|
}
|
||||||
if loginWebView.url?.host?.hasSuffix("claude.ai") == true {
|
apiWebView = loginWebView
|
||||||
apiWebView = loginWebView
|
|
||||||
} else {
|
|
||||||
await prepareApiWebView()
|
|
||||||
}
|
|
||||||
await refresh()
|
await refresh()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Creates (or reuses) a background WKWebView navigated to claude.ai for JS fetch.
|
|
||||||
private func prepareApiWebView() async {
|
|
||||||
if let wv = apiWebView, wv.url?.host?.hasSuffix("claude.ai") == true { return }
|
|
||||||
let config = WKWebViewConfiguration()
|
|
||||||
config.websiteDataStore = WKWebsiteDataStore.default()
|
|
||||||
let wv = WKWebView(frame: CGRect(x: 0, y: 0, width: 1, height: 1), configuration: config)
|
|
||||||
apiWebView = wv
|
|
||||||
await withCheckedContinuation { (cont: CheckedContinuation<Void, Never>) in
|
|
||||||
let waiter = WKNavWaiter { cont.resume() }
|
|
||||||
self.navWaiter = waiter
|
|
||||||
wv.navigationDelegate = waiter
|
|
||||||
wv.load(URLRequest(url: URL(string: "https://claude.ai/")!))
|
|
||||||
}
|
|
||||||
wv.navigationDelegate = nil
|
|
||||||
navWaiter = nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Runs a fetch() inside the live claude.ai WebView — same browser context as the frontend,
|
// Runs a fetch() inside the live claude.ai WebView — same browser context as the frontend,
|
||||||
// so no CORS/fingerprinting issues that URLSession hits.
|
// so no CORS/fingerprinting issues that URLSession hits.
|
||||||
private func jsFetch(_ path: String) async throws -> (Int, String) {
|
private func jsFetch(_ path: String) async throws -> (Int, String) {
|
||||||
@@ -117,7 +100,6 @@ class UsageViewModel: ObservableObject {
|
|||||||
diagLastPath = path
|
diagLastPath = path
|
||||||
diagLastFetch = Date()
|
diagLastFetch = Date()
|
||||||
diagLastStatus = status
|
diagLastStatus = status
|
||||||
diagLastBody = String(body.prefix(500))
|
|
||||||
diagLastError = status != 200 ? "JS HTTP \(status)" : ""
|
diagLastError = status != 200 ? "JS HTTP \(status)" : ""
|
||||||
return (status, body)
|
return (status, body)
|
||||||
}
|
}
|
||||||
@@ -181,7 +163,6 @@ class UsageViewModel: ObservableObject {
|
|||||||
guard let http = response as? HTTPURLResponse else { throw AppError.networkError }
|
guard let http = response as? HTTPURLResponse else { throw AppError.networkError }
|
||||||
let body = String(data: data, encoding: .utf8) ?? ""
|
let body = String(data: data, encoding: .utf8) ?? ""
|
||||||
diagLastStatus = http.statusCode
|
diagLastStatus = http.statusCode
|
||||||
diagLastBody = String(body.prefix(500))
|
|
||||||
if http.statusCode != 200 {
|
if http.statusCode != 200 {
|
||||||
diagLastError = "HTTP \(http.statusCode)"
|
diagLastError = "HTTP \(http.statusCode)"
|
||||||
}
|
}
|
||||||
@@ -198,8 +179,8 @@ class UsageViewModel: ObservableObject {
|
|||||||
let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
|
let cookies = await WKWebsiteDataStore.default().httpCookieStore.allCookies()
|
||||||
guard cookies.contains(where: { $0.domain.contains("claude.ai") }) else { return }
|
guard cookies.contains(where: { $0.domain.contains("claude.ai") }) else { return }
|
||||||
isSignedIn = true
|
isSignedIn = true
|
||||||
await prepareApiWebView()
|
// AppDelegate's primer WebView will call adoptPrimerWebView once it loads,
|
||||||
await refresh()
|
// which triggers the first real data fetch.
|
||||||
}
|
}
|
||||||
|
|
||||||
func signOut() async {
|
func signOut() async {
|
||||||
@@ -248,7 +229,7 @@ class UsageViewModel: ObservableObject {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let (fetchedOrgId, fetchedEmail, fetchedPlan) = try await fetchBootstrap()
|
let (fetchedOrgId, fetchedEmail, fetchedPlan) = try await fetchBootstrap(preferredOrgId: cookieOrgId)
|
||||||
|
|
||||||
let orgId: String
|
let orgId: String
|
||||||
if let id = cookieOrgId ?? fetchedOrgId {
|
if let id = cookieOrgId ?? fetchedOrgId {
|
||||||
@@ -306,7 +287,7 @@ class UsageViewModel: ObservableObject {
|
|||||||
|
|
||||||
// MARK: - Bootstrap
|
// MARK: - Bootstrap
|
||||||
|
|
||||||
private func fetchBootstrap() async throws -> (orgId: String?, email: String?, planLabel: String?) {
|
private func fetchBootstrap(preferredOrgId: String? = nil) async throws -> (orgId: String?, email: String?, planLabel: String?) {
|
||||||
let (status, body) = try await apiFetch("/api/bootstrap")
|
let (status, body) = try await apiFetch("/api/bootstrap")
|
||||||
if status == 401 || status == 403 {
|
if status == 401 || status == 403 {
|
||||||
throw AppError.detail("HTTP \(status) — \(body.prefix(120))")
|
throw AppError.detail("HTTP \(status) — \(body.prefix(120))")
|
||||||
@@ -315,7 +296,6 @@ class UsageViewModel: ObservableObject {
|
|||||||
guard body.trimmingCharacters(in: .whitespacesAndNewlines).hasPrefix("{") else {
|
guard body.trimmingCharacters(in: .whitespacesAndNewlines).hasPrefix("{") else {
|
||||||
throw AppError.detail("Non-JSON response (HTML?): \(body.prefix(80))")
|
throw AppError.detail("Non-JSON response (HTML?): \(body.prefix(80))")
|
||||||
}
|
}
|
||||||
diagBootstrapBody = String(body.prefix(500))
|
|
||||||
guard let data = body.data(using: .utf8),
|
guard let data = body.data(using: .utf8),
|
||||||
let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
|
let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
|
||||||
return (nil, nil, nil)
|
return (nil, nil, nil)
|
||||||
@@ -323,7 +303,8 @@ class UsageViewModel: ObservableObject {
|
|||||||
|
|
||||||
let account = json["account"] as? [String: Any]
|
let account = json["account"] as? [String: Any]
|
||||||
let memberships = (account?["memberships"] ?? json["memberships"]) as? [[String: Any]]
|
let memberships = (account?["memberships"] ?? json["memberships"]) as? [[String: Any]]
|
||||||
let firstOrg = memberships?.first?["organization"] as? [String: Any]
|
let allOrgs = memberships?.compactMap { $0["organization"] as? [String: Any] } ?? []
|
||||||
|
let firstOrg = allOrgs.first
|
||||||
|
|
||||||
var orgId: String? = firstOrg?["uuid"] as? String
|
var orgId: String? = firstOrg?["uuid"] as? String
|
||||||
if orgId == nil {
|
if orgId == nil {
|
||||||
@@ -340,8 +321,10 @@ class UsageViewModel: ObservableObject {
|
|||||||
|
|
||||||
let email = account?["email_address"] as? String
|
let email = account?["email_address"] as? String
|
||||||
|
|
||||||
|
// Read capabilities from the preferred (active) org, falling back to first org.
|
||||||
|
let capOrg = preferredOrgId.flatMap { id in allOrgs.first(where: { $0["uuid"] as? String == id }) } ?? firstOrg
|
||||||
var planLabel: String? = nil
|
var planLabel: String? = nil
|
||||||
if let caps = firstOrg?["capabilities"] as? [String],
|
if let caps = capOrg?["capabilities"] as? [String],
|
||||||
let cap = caps.first(where: { $0.hasPrefix("claude_") }) {
|
let cap = caps.first(where: { $0.hasPrefix("claude_") }) {
|
||||||
let name = String(cap.dropFirst("claude_".count))
|
let name = String(cap.dropFirst("claude_".count))
|
||||||
planLabel = name.prefix(1).uppercased() + name.dropFirst().lowercased()
|
planLabel = name.prefix(1).uppercased() + name.dropFirst().lowercased()
|
||||||
@@ -488,16 +471,6 @@ class UsageViewModel: ObservableObject {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Navigation delegate that resolves a continuation on first finish/error (idempotent).
|
|
||||||
private class WKNavWaiter: NSObject, WKNavigationDelegate {
|
|
||||||
private var done = false
|
|
||||||
private let onDone: () -> Void
|
|
||||||
init(_ onDone: @escaping () -> Void) { self.onDone = onDone }
|
|
||||||
private func finish() { guard !done else { return }; done = true; onDone() }
|
|
||||||
func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) { finish() }
|
|
||||||
func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) { finish() }
|
|
||||||
func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) { finish() }
|
|
||||||
}
|
|
||||||
|
|
||||||
enum AppError: LocalizedError {
|
enum AppError: LocalizedError {
|
||||||
case notAuthenticated
|
case notAuthenticated
|
||||||
|
|||||||
@@ -7,10 +7,13 @@
|
|||||||
**A native macOS menubar app for monitoring your Claude AI usage limits in real time.**
|
**A native macOS menubar app for monitoring your Claude AI usage limits in real time.**
|
||||||
|
|
||||||
[](https://www.apple.com/macos/)
|
[](https://www.apple.com/macos/)
|
||||||
|
[](https://www.microsoft.com/windows/)
|
||||||
[](https://swift.org)
|
[](https://swift.org)
|
||||||
[](https://github.com/superdooper86/claudechecker/releases)
|
|
||||||
[](LICENSE)
|
[](LICENSE)
|
||||||
[](https://github.com/superdooper86/claudechecker/releases/tag/v1.2.1-beta.23) <!-- BETA_BADGE -->
|
<br/>
|
||||||
|
[](https://github.com/superdooper86/claudechecker/releases)
|
||||||
|
[](https://github.com/superdooper86/claudechecker/releases/tag/v1.3.3-beta.3) <!-- BETA_BADGE -->
|
||||||
|
[](https://github.com/superdooper86/claudechecker/releases/tag/win-v0.0.1-beta.55) <!-- WIN_BETA_BADGE -->
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
+3
-19
@@ -1,20 +1,4 @@
|
|||||||
## What's new in v1.2.1-beta.18
|
## What's new in v1.3.2
|
||||||
|
|
||||||
### Bug fixes
|
### Reliability
|
||||||
- Replaced callAsyncJavaScript fetch approach with WebKit navigation: instead of running `fetch()` in the page's JS context (which was returning 401 because it bypasses the SPA's auth interceptors), each API call now navigates the WebView to the API URL directly. WebKit sends full browser headers and cookies automatically at the HTTP layer, the same way a real browser navigation works. This is more reliable regardless of what server-side auth mechanism claude.ai uses.
|
- Data now loads automatically on every app launch without requiring manual re-authentication. The background WebView is anchored in a hidden window so macOS no longer throttles its JavaScript execution.
|
||||||
- API calls are now sequential to share a single WebView for all navigations
|
|
||||||
- Added redirect detection: if WebKit follows a 302 to /login, the response is treated as an auth failure rather than returning HTML to the JSON parser
|
|
||||||
|
|
||||||
## What's new in v1.2.1-beta.17
|
|
||||||
|
|
||||||
### Bug fixes
|
|
||||||
- Fixed "Not signed in" after login by adopting the login WebView directly for API calls
|
|
||||||
- Added diagnostic error messages for JS errors and unexpected responses
|
|
||||||
|
|
||||||
## What's new in v1.2.1
|
|
||||||
|
|
||||||
### Bug fixes
|
|
||||||
- Fixed WebKit suspending the background WKWebView: anchored in a transparent 1×1 NSWindow
|
|
||||||
- Fixed login window auto-closing before sign-in completes
|
|
||||||
- Added /api/organizations as a final fallback for org ID resolution
|
|
||||||
- Fixed Settings incorrectly showing "Signed in" after a failed refresh
|
|
||||||
|
|||||||
+1
-5
@@ -1,5 +1 @@
|
|||||||
{
|
{"version": "1.3.3-beta.3", "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.3.3-beta.3/ClaudeChecker.zip", "notes": "## What's new in v1.3.2\n\n### Reliability\n- Data now loads automatically on every app launch without requiring manual re-authentication. The background WebView is anchored in a hidden window so macOS no longer throttles its JavaScript execution."}
|
||||||
"version": "1.2.1-beta.23",
|
|
||||||
"url": "https://github.com/superdooper86/claudechecker/releases/download/v1.2.1-beta.23/ClaudeChecker.zip",
|
|
||||||
"notes": "## What's new in v1.2.1-beta.18\n\n### Bug fixes\n- Replaced callAsyncJavaScript fetch approach with WebKit navigation: instead of running `fetch()` in the page's JS context (which was returning 401 because it bypasses the SPA's auth interceptors), each API call now navigates the WebView to the API URL directly. WebKit sends full browser headers and cookies automatically at the HTTP layer, the same way a real browser navigation works. This is more reliable regardless of what server-side auth mechanism claude.ai uses.\n- API calls are now sequential to share a single WebView for all navigations\n- Added redirect detection: if WebKit follows a 302 to /login, the response is treated as an auth failure rather than returning HTML to the JSON parser\n\n## What's new in v1.2.1-beta.17\n\n### Bug fixes\n- Fixed \"Not signed in\" after login by adopting the login WebView directly for API calls\n- Added diagnostic error messages for JS errors and unexpected responses\n\n## What's new in v1.2.1\n\n### Bug fixes\n- Fixed WebKit suspending the background WKWebView: anchored in a transparent 1×1 NSWindow\n- Fixed login window auto-closing before sign-in completes\n- Added /api/organizations as a final fallback for org ID resolution\n- Fixed Settings incorrectly showing \"Signed in\" after a failed refresh"
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"version": "0.0.1-beta.49",
|
"version": "0.0.1-beta.55",
|
||||||
"url": "https://github.com/superdooper86/claudechecker/releases/download/win-v0.0.1-beta.49/ClaudeChecker-Windows.zip",
|
"url": "https://github.com/superdooper86/claudechecker/releases/download/win-v0.0.1-beta.55/ClaudeChecker-Windows.zip",
|
||||||
"notes": "## What's new in beta.36\r\n\r\n### Bug fixes\r\n- Settings no longer incorrectly shows \"Not signed in\" when limits are working\r\n- Session Diary now shows correctly after the first successful refresh\r\n- Extra Usage Credits section now restored from cache on startup\r\n- Plan name, overage, and prepaid credits are now cached and shown immediately on launch\r\n- App now loads cached state instantly on startup before the background refresh completes"
|
"notes": "## What's new in beta.49\r\n\r\n### Architecture\r\n- All data (usage, plan, overage, prepaid credits) now fetched via the persistent background WebView2 — the same always-live session as the macOS app, so Cloudflare cookies never expire between refreshes\r\n- HttpClient path kept only as a brief startup fallback before the browser is ready\r\n- Settings file simplified: only stores session signal, burn history, and user preferences — no more cached API responses\r\n\r\n### Bug fixes\r\n- Plan label (e.g. \"Pro\") now updates on every refresh, not just at login\r\n- Extra Usage Credits values now correct (were 100× too large)\r\n- Limit and balance now update live on every refresh\r\n- Refresh interval dropdown now shows \"1 min\", \"2 min\" etc. correctly\r\n- ComboBox no longer flashes bright blue when clicked\r\n- Buttons now show a visible pressed state\r\n- Footer \"Updated X ago\" counter now ticks every second; shows \"X min, Y sec ago\" past 60 s\r\n- Removed stray sparkline bars from the 5 h and 7 d limit cards\r\n- App window now shown on launch\r\n\r\n### UI improvements\r\n- Gauge percentage larger, \"used\" label removed\r\n- Each limit card now shows an \"after reset\" or \"today HH:MM\" badge\r\n- Session Diary card redesigned to match macOS layout (stats row + sparkline, no Claude header)\r\n- Reset date moved inline with time remaining"
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"version": "1.2.0",
|
"version": "1.3.2",
|
||||||
"url": "https://github.com/superdooper86/claudechecker/releases/download/v1.2.0/ClaudeChecker.zip",
|
"url": "https://github.com/superdooper86/claudechecker/releases/download/v1.3.2/ClaudeChecker.zip",
|
||||||
"notes": "## What's new in v1.2.0\n\n### Bug fixes\n- App now works for all users — org ID is fetched dynamically from the API instead of being hardcoded\n- Plan name (e.g. Pro, Max) now updates correctly on every refresh\n\n### Improvements\n- Plan name is read from the API rather than hardcoded\n- Bootstrap API call consolidated — org ID, email, and plan name fetched in a single request per refresh\n- Main panel no longer scrolls — popover auto-sizes to fit content\n- Session Diary card redesigned — sample count and avg burn rate shown left/right above the sparkline, Claude header removed"
|
"notes": "## What's new in v1.3.2\n\n### Reliability\n- Data now loads automatically on every app launch without requiring manual re-authentication. The background WebView is anchored in a hidden window so macOS no longer throttles its JavaScript execution."
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user