beta.18: navigate-and-read API fetch replaces callAsyncJavaScript
This commit is contained in:
SuperDooper
@@ -30,14 +30,11 @@ class UsageViewModel: ObservableObject {
|
||||
private var previousPercents: [String: Double] = [:]
|
||||
private var firedThresholds: [String: Set<Int>] = [:]
|
||||
|
||||
// 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.
|
||||
// Background WKWebView for API calls via WebKit navigation.
|
||||
// Hosted in a hidden NSWindow to keep the WebKit process active.
|
||||
private var apiWebView: WKWebView?
|
||||
private var apiDelegate: APIWebViewDelegate?
|
||||
private var apiWindow: NSWindow?
|
||||
private var apiWebViewLoaded = false
|
||||
private var apiReadyContinuations: [CheckedContinuation<Void, Never>] = []
|
||||
private var currentFetchDelegate: APIFetchDelegate?
|
||||
|
||||
init() {
|
||||
let saved = UserDefaults.standard.double(forKey: "refresh_interval")
|
||||
@@ -57,18 +54,9 @@ class UsageViewModel: ObservableObject {
|
||||
let config = WKWebViewConfiguration()
|
||||
config.websiteDataStore = WKWebsiteDataStore.default()
|
||||
let wv = WKWebView(frame: NSRect(x: 0, y: 0, width: 1, height: 1), configuration: config)
|
||||
let del = APIWebViewDelegate()
|
||||
del.onNavigationEnd = { [weak self] in
|
||||
guard let self else { return }
|
||||
self.apiWebViewLoaded = true
|
||||
self.resumeAPIReadyContinuations()
|
||||
}
|
||||
wv.navigationDelegate = del
|
||||
apiWebView = wv
|
||||
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.
|
||||
// Hosting in a 1×1 transparent window keeps the WebKit process active.
|
||||
let window = NSWindow(
|
||||
contentRect: NSRect(x: 0, y: 0, width: 1, height: 1),
|
||||
styleMask: .borderless,
|
||||
@@ -81,56 +69,28 @@ class UsageViewModel: ObservableObject {
|
||||
window.contentView?.addSubview(wv)
|
||||
window.orderFrontRegardless()
|
||||
apiWindow = window
|
||||
|
||||
wv.load(URLRequest(url: URL(string: "https://claude.ai")!))
|
||||
}
|
||||
|
||||
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: adopts the proven-authenticated login WebView for all API calls.
|
||||
// This avoids the background WebView potentially missing auth tokens that only exist
|
||||
// in the login WebView's JS context (localStorage, Service Workers, etc.).
|
||||
// Called after login: adopt the login WebView (proven authenticated) and refresh.
|
||||
func adoptAndRefresh(_ loginWebView: WKWebView) async {
|
||||
loginWebView.removeFromSuperview()
|
||||
loginWebView.frame = NSRect(x: 0, y: 0, width: 1, height: 1)
|
||||
apiWindow?.contentView?.addSubview(loginWebView)
|
||||
apiWebView = loginWebView
|
||||
apiWebViewLoaded = true
|
||||
resumeAPIReadyContinuations()
|
||||
try? await Task.sleep(nanoseconds: 400_000_000)
|
||||
await refresh()
|
||||
}
|
||||
|
||||
// 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.
|
||||
// Fetches an API path by navigating the WebView to the URL and reading the response.
|
||||
// Navigation lets WebKit send full browser headers and cookies automatically —
|
||||
// more reliable than callAsyncJavaScript fetch, which bypasses SPA auth interceptors.
|
||||
private func webViewFetch(_ path: String) async throws -> (statusCode: Int, body: String) {
|
||||
guard let wv = apiWebView else { throw AppError.detail("no webview") }
|
||||
await waitForAPIWebViewReady()
|
||||
let js = "const r = await fetch(path, {credentials:'include'}); return {s: r.status, b: await r.text()};"
|
||||
do {
|
||||
let result = try await wv.callAsyncJavaScript(js, arguments: ["path": path], in: nil, in: .page)
|
||||
guard let d = result as? [String: Any],
|
||||
let s = (d["s"] as? NSNumber)?.intValue,
|
||||
let b = d["b"] as? String else {
|
||||
throw AppError.detail("bad result: \(String(describing: result).prefix(120))")
|
||||
}
|
||||
return (s, b)
|
||||
} catch let e as AppError { throw e }
|
||||
catch {
|
||||
let loc = wv.url?.absoluteString ?? "?"
|
||||
throw AppError.detail("JS err @ \(loc): \(error.localizedDescription.prefix(100))")
|
||||
guard let wv = apiWebView else { throw AppError.detail("no api webview") }
|
||||
return try await withCheckedThrowingContinuation { cont in
|
||||
let delegate = APIFetchDelegate(continuation: cont)
|
||||
currentFetchDelegate = delegate
|
||||
wv.navigationDelegate = delegate
|
||||
wv.load(URLRequest(url: URL(string: "https://claude.ai\(path)")!))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -154,7 +114,6 @@ class UsageViewModel: ObservableObject {
|
||||
extraUsage = nil
|
||||
prepaidCredits = nil
|
||||
overageSpendLimit = nil
|
||||
apiWebViewLoaded = false
|
||||
apiWebView?.load(URLRequest(url: URL(string: "https://claude.ai")!))
|
||||
}
|
||||
|
||||
@@ -180,10 +139,10 @@ class UsageViewModel: ObservableObject {
|
||||
if let email = fetchedEmail { userEmail = email }
|
||||
if let plan = fetchedPlan { planLabel = plan }
|
||||
|
||||
async let usageFetch = fetchUsage(orgId: orgId)
|
||||
async let prepaidFetch = fetchPrepaidCredits(orgId: orgId)
|
||||
async let overageFetch = fetchOverageSpendLimit(orgId: orgId)
|
||||
let (usage, prepaid, overage) = try await (usageFetch, prepaidFetch, overageFetch)
|
||||
// Sequential — each call navigates the shared WebView to the next API URL.
|
||||
let usage = try await fetchUsage(orgId: orgId)
|
||||
let prepaid = try? await fetchPrepaidCredits(orgId: orgId)
|
||||
let overage = try? await fetchOverageSpendLimit(orgId: orgId)
|
||||
limits = buildLimits(from: usage)
|
||||
extraUsage = usage.extraUsage
|
||||
prepaidCredits = prepaid
|
||||
@@ -226,7 +185,11 @@ class UsageViewModel: ObservableObject {
|
||||
private func fetchBootstrap() async throws -> (orgId: String?, email: String?, planLabel: String?) {
|
||||
let (status, body) = try await webViewFetch("/api/bootstrap")
|
||||
if status == 401 || status == 403 { throw AppError.notAuthenticated }
|
||||
guard status == 200 else { throw AppError.networkError }
|
||||
guard status == 200 else { throw AppError.detail("bootstrap \(status): \(body.prefix(80))") }
|
||||
// If WebKit followed a redirect to the login page we get HTML instead of JSON.
|
||||
guard body.trimmingCharacters(in: .whitespacesAndNewlines).hasPrefix("{") else {
|
||||
throw AppError.notAuthenticated
|
||||
}
|
||||
guard let data = body.data(using: .utf8),
|
||||
let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
|
||||
return (nil, nil, nil)
|
||||
@@ -398,19 +361,56 @@ class UsageViewModel: ObservableObject {
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - API WebView Delegate
|
||||
// MARK: - API Fetch Delegate
|
||||
|
||||
private class APIWebViewDelegate: NSObject, WKNavigationDelegate {
|
||||
var onNavigationEnd: (() -> Void)?
|
||||
// Captures the HTTP status code and response body from a WebView navigation.
|
||||
// Used by webViewFetch to turn a navigation into an async (statusCode, body) result.
|
||||
private class APIFetchDelegate: NSObject, WKNavigationDelegate {
|
||||
private let continuation: CheckedContinuation<(Int, String), Error>
|
||||
private var capturedStatus = 0
|
||||
private var finished = false
|
||||
|
||||
init(continuation: CheckedContinuation<(Int, String), Error>) {
|
||||
self.continuation = continuation
|
||||
}
|
||||
|
||||
private func complete(_ result: Result<(Int, String), Error>) {
|
||||
guard !finished else { return }
|
||||
finished = true
|
||||
continuation.resume(with: result)
|
||||
}
|
||||
|
||||
func webView(_ webView: WKWebView, decidePolicyFor response: WKNavigationResponse,
|
||||
decisionHandler: @escaping (WKNavigationResponsePolicy) -> Void) {
|
||||
if let http = response.response as? HTTPURLResponse {
|
||||
capturedStatus = http.statusCode
|
||||
}
|
||||
decisionHandler(.allow)
|
||||
}
|
||||
|
||||
func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
|
||||
onNavigationEnd?()
|
||||
let status = capturedStatus
|
||||
// Detect auth redirect: if WebKit followed a 302 to /login, finalURL changes.
|
||||
let finalURL = webView.url?.absoluteString ?? ""
|
||||
if finalURL.contains("/login") || finalURL.contains("/auth") {
|
||||
complete(.success((401, "redirected:\(finalURL)")))
|
||||
return
|
||||
}
|
||||
webView.evaluateJavaScript("document.body.innerText ?? ''") { [weak self] result, error in
|
||||
if let body = result as? String {
|
||||
self?.complete(.success((status, body)))
|
||||
} else {
|
||||
self?.complete(.failure(AppError.detail("body read: \(error?.localizedDescription ?? "nil")")))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
|
||||
onNavigationEnd?()
|
||||
complete(.failure(AppError.detail("nav: \(error.localizedDescription.prefix(80))")))
|
||||
}
|
||||
|
||||
func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
|
||||
onNavigationEnd?()
|
||||
complete(.failure(AppError.detail("prov: \(error.localizedDescription.prefix(80))")))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user