@askalf/dario 3.0.3 → 3.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/oauth.js +20 -3
- package/package.json +1 -1
package/dist/oauth.js
CHANGED
|
@@ -15,6 +15,9 @@ const OAUTH_TOKEN_URL = 'https://platform.claude.com/v1/oauth/token';
|
|
|
15
15
|
const OAUTH_SCOPES = 'org:create_api_key user:profile user:inference user:sessions:claude_code user:mcp_servers user:file_upload';
|
|
16
16
|
// Refresh 30 min before expiry
|
|
17
17
|
const REFRESH_BUFFER_MS = 30 * 60 * 1000;
|
|
18
|
+
// After a failed refresh, don't retry for 60s to avoid spam
|
|
19
|
+
let lastRefreshFailure = 0;
|
|
20
|
+
const REFRESH_COOLDOWN_MS = 60 * 1000;
|
|
18
21
|
// In-memory credential cache — avoids disk reads on every request
|
|
19
22
|
let credentialsCache = null;
|
|
20
23
|
let credentialsCacheTime = 0;
|
|
@@ -210,6 +213,8 @@ async function doRefreshTokens() {
|
|
|
210
213
|
signal: AbortSignal.timeout(15000),
|
|
211
214
|
});
|
|
212
215
|
if (!res.ok) {
|
|
216
|
+
const errBody = await res.text().catch(() => '');
|
|
217
|
+
console.error(`[dario] Refresh attempt ${attempt + 1}/3 failed: HTTP ${res.status} — ${errBody.slice(0, 200)}`);
|
|
213
218
|
if (res.status === 401 || res.status === 403) {
|
|
214
219
|
throw new Error(`Refresh token rejected (${res.status}). Run \`dario login\` to re-authenticate.`);
|
|
215
220
|
}
|
|
@@ -240,10 +245,22 @@ export async function getAccessToken() {
|
|
|
240
245
|
if (oauth.expiresAt > Date.now() + REFRESH_BUFFER_MS) {
|
|
241
246
|
return oauth.accessToken;
|
|
242
247
|
}
|
|
243
|
-
// Need refresh
|
|
248
|
+
// Need refresh — but don't spam if we just failed
|
|
249
|
+
if (Date.now() - lastRefreshFailure < REFRESH_COOLDOWN_MS) {
|
|
250
|
+
// Still in cooldown from a recent failure, use current token even if expiring
|
|
251
|
+
return oauth.accessToken;
|
|
252
|
+
}
|
|
244
253
|
console.log('[dario] Token expiring soon, refreshing...');
|
|
245
|
-
|
|
246
|
-
|
|
254
|
+
try {
|
|
255
|
+
const refreshed = await refreshTokens();
|
|
256
|
+
return refreshed.accessToken;
|
|
257
|
+
}
|
|
258
|
+
catch (err) {
|
|
259
|
+
lastRefreshFailure = Date.now();
|
|
260
|
+
console.error(`[dario] Refresh failed: ${err instanceof Error ? err.message : err}. Will retry in 60s. Run \`dario login\` if this persists.`);
|
|
261
|
+
// Return current token — it might still work for a few more minutes
|
|
262
|
+
return oauth.accessToken;
|
|
263
|
+
}
|
|
247
264
|
}
|
|
248
265
|
/**
|
|
249
266
|
* Get token status info.
|