@modelprofile.com/authswitch 3.3.0 → 5.0.0
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_ts/00_commitinfo_data.js +3 -3
- package/dist_ts/accounts.d.ts +52 -15
- package/dist_ts/accounts.js +110 -27
- package/dist_ts/classes.accountlist.d.ts +0 -25
- package/dist_ts/classes.accountlist.js +2 -216
- package/dist_ts/classes.claudecodeharness.d.ts +81 -2
- package/dist_ts/classes.claudecodeharness.js +208 -14
- package/dist_ts/classes.claudecodelocks.d.ts +38 -0
- package/dist_ts/classes.claudecodelocks.js +118 -0
- package/dist_ts/classes.claudestatus.d.ts +15 -2
- package/dist_ts/classes.claudestatus.js +100 -83
- package/dist_ts/classes.claudetokenrefresh.d.ts +32 -0
- package/dist_ts/classes.claudetokenrefresh.js +77 -0
- package/dist_ts/classes.cli.d.ts +14 -7
- package/dist_ts/classes.cli.js +126 -66
- package/dist_ts/classes.codexharness.d.ts +4 -0
- package/dist_ts/classes.codexharness.js +5 -1
- package/dist_ts/classes.codexstatus.d.ts +7 -2
- package/dist_ts/classes.codexstatus.js +49 -21
- package/dist_ts/classes.credentialstore.d.ts +43 -2
- package/dist_ts/classes.credentialstore.js +60 -13
- package/dist_ts/classes.fileharness.d.ts +45 -21
- package/dist_ts/classes.fileharness.js +64 -26
- package/dist_ts/classes.limits.d.ts +46 -7
- package/dist_ts/classes.limits.js +94 -36
- package/dist_ts/classes.listrenderer.d.ts +17 -0
- package/dist_ts/classes.listrenderer.js +313 -0
- package/dist_ts/classes.login.d.ts +1 -1
- package/dist_ts/classes.login.js +1 -1
- package/dist_ts/classes.opencodeharness.d.ts +4 -0
- package/dist_ts/classes.opencodeharness.js +8 -4
- package/dist_ts/classes.operations.js +3 -2
- package/dist_ts/classes.tui.js +4 -3
- package/dist_ts/classes.watch.d.ts +108 -0
- package/dist_ts/classes.watch.js +219 -0
- package/dist_ts/classes.watchlock.d.ts +33 -0
- package/dist_ts/classes.watchlock.js +118 -0
- package/dist_ts/claudehttp.d.ts +39 -0
- package/dist_ts/claudehttp.js +83 -0
- package/dist_ts/cliargs.d.ts +36 -0
- package/dist_ts/cliargs.js +60 -0
- package/dist_ts/consoletable.d.ts +21 -0
- package/dist_ts/consoletable.js +63 -0
- package/dist_ts/helpers.d.ts +7 -0
- package/dist_ts/helpers.js +16 -1
- package/dist_ts/index.d.ts +3 -0
- package/dist_ts/index.js +4 -1
- package/dist_ts/interfaces.harness.d.ts +60 -11
- package/dist_ts/interfaces.list.d.ts +3 -1
- package/dist_ts/plugins.d.ts +7 -0
- package/dist_ts/plugins.js +6 -1
- package/dist_ts/ratelimit.d.ts +8 -0
- package/dist_ts/ratelimit.js +13 -0
- package/dist_ts/watchpolicy.d.ts +44 -0
- package/dist_ts/watchpolicy.js +82 -0
- package/package.json +5 -3
- package/readme.md +349 -115
- package/ts/00_commitinfo_data.ts +3 -3
- package/ts/accounts.ts +122 -35
- package/ts/classes.accountlist.ts +2 -219
- package/ts/classes.claudecodeharness.ts +199 -13
- package/ts/classes.claudecodelocks.ts +133 -0
- package/ts/classes.claudestatus.ts +100 -65
- package/ts/classes.claudetokenrefresh.ts +85 -0
- package/ts/classes.cli.ts +114 -54
- package/ts/classes.codexharness.ts +4 -0
- package/ts/classes.codexstatus.ts +40 -18
- package/ts/classes.credentialstore.ts +78 -10
- package/ts/classes.fileharness.ts +76 -34
- package/ts/classes.limits.ts +110 -36
- package/ts/classes.listrenderer.ts +328 -0
- package/ts/classes.login.ts +1 -1
- package/ts/classes.opencodeharness.ts +7 -3
- package/ts/classes.operations.ts +2 -1
- package/ts/classes.tui.ts +3 -2
- package/ts/classes.watch.ts +263 -0
- package/ts/classes.watchlock.ts +100 -0
- package/ts/claudehttp.ts +92 -0
- package/ts/cliargs.ts +71 -0
- package/ts/consoletable.ts +62 -0
- package/ts/helpers.ts +14 -0
- package/ts/index.ts +3 -0
- package/ts/interfaces.harness.ts +60 -5
- package/ts/interfaces.list.ts +3 -1
- package/ts/plugins.ts +9 -0
- package/ts/ratelimit.ts +14 -0
- package/ts/watchpolicy.ts +121 -0
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { credentialRecord, credentialText } from './classes.credentialstore.js';
|
|
1
|
+
import { credentialHash, credentialRecord, credentialText } from './classes.credentialstore.js';
|
|
2
|
+
import { claudeRequest, ClaudeLoginRejectedError, ClaudeRateLimitError, ClaudeRequestError } from './claudehttp.js';
|
|
3
|
+
import { latestRetryAt } from './ratelimit.js';
|
|
2
4
|
import { plainText } from './formatting.js';
|
|
3
|
-
|
|
4
|
-
}
|
|
5
|
+
import { usageWindowPeriod } from './accounts.js';
|
|
5
6
|
/** Reset times are normalised to ISO 8601 UTC; an unparsable one rejects the whole usage response. */
|
|
6
7
|
const resetTimestamp = (value) => value == null ? null : new Date(String(value)).toISOString();
|
|
7
8
|
const SERVER_NAME_LENGTH = 64;
|
|
@@ -12,14 +13,14 @@ const serverName = (value) => {
|
|
|
12
13
|
throw new Error('Unsupported Claude usage name.');
|
|
13
14
|
return name;
|
|
14
15
|
};
|
|
15
|
-
/** Keyed windows, read only from a usage body that carries no limits[] rows. */
|
|
16
|
+
/** Keyed windows, read only from a usage body that carries no limits[] rows: what each meter is about, and how long its window is. */
|
|
16
17
|
const KEYED_WINDOWS = [
|
|
17
|
-
['five_hour', 'Claude
|
|
18
|
-
['seven_day_oauth_apps', 'OAuth apps
|
|
18
|
+
['five_hour', 'Claude', 18000, 'account'], ['seven_day', 'Claude', 604800, 'account'],
|
|
19
|
+
['seven_day_oauth_apps', 'OAuth apps', 604800, 'feature'], ['seven_day_opus', 'Opus', 604800, 'feature'], ['seven_day_sonnet', 'Sonnet', 604800, 'feature'],
|
|
19
20
|
];
|
|
20
21
|
const keyedWindows = (usage) => {
|
|
21
22
|
const windows = [];
|
|
22
|
-
for (const [key,
|
|
23
|
+
for (const [key, subject, durationSeconds, scope] of KEYED_WINDOWS) {
|
|
23
24
|
if (usage[key] == null)
|
|
24
25
|
continue;
|
|
25
26
|
const window = credentialRecord(usage[key]);
|
|
@@ -27,17 +28,17 @@ const keyedWindows = (usage) => {
|
|
|
27
28
|
continue;
|
|
28
29
|
if (typeof window.utilization !== 'number' || !Number.isFinite(window.utilization) || window.utilization < 0)
|
|
29
30
|
throw new Error('Unsupported Claude usage utilization.');
|
|
30
|
-
windows.push({ label
|
|
31
|
+
windows.push({ label: `${subject} ${usageWindowPeriod(durationSeconds)}`, durationSeconds, scope, usedPercent: window.utilization, resetAt: resetTimestamp(window.resets_at) });
|
|
31
32
|
}
|
|
32
33
|
return windows;
|
|
33
34
|
};
|
|
34
35
|
/**
|
|
35
|
-
* The limits[] row groups the window model represents: each group's duration,
|
|
36
|
-
*
|
|
36
|
+
* The limits[] row groups the window model represents: each group's duration, which names its windows,
|
|
37
|
+
* and the kind of the group's unscoped account meter, which keeps the plain label.
|
|
37
38
|
*/
|
|
38
39
|
const LIMIT_GROUPS = new Map([
|
|
39
|
-
['session', { durationSeconds: 18000,
|
|
40
|
-
['weekly', { durationSeconds: 604800,
|
|
40
|
+
['session', { durationSeconds: 18000, accountKind: 'session' }],
|
|
41
|
+
['weekly', { durationSeconds: 604800, accountKind: 'weekly_all' }],
|
|
41
42
|
]);
|
|
42
43
|
const isUsageSeverity = (value) => value === 'normal' || value === 'warning' || value === 'critical';
|
|
43
44
|
/** A scope part is absent (null or omitted) or names the model or surface a row is for. */
|
|
@@ -72,8 +73,9 @@ const limitWindows = (rows) => {
|
|
|
72
73
|
continue;
|
|
73
74
|
}
|
|
74
75
|
const severity = row.severity;
|
|
76
|
+
const period = usageWindowPeriod(meter.durationSeconds);
|
|
75
77
|
windows.push({
|
|
76
|
-
label: subject === undefined ? `Claude ${
|
|
78
|
+
label: subject === undefined ? `Claude ${period}${kind === meter.accountKind ? '' : ` (${kindName})`}` : `${subject} ${period}`,
|
|
77
79
|
durationSeconds: meter.durationSeconds, scope: subject === undefined ? 'account' : 'feature', usedPercent, resetAt,
|
|
78
80
|
...(isUsageSeverity(severity) ? { severity } : {}),
|
|
79
81
|
...(row.is_active === true ? { headline: true } : {}),
|
|
@@ -91,66 +93,82 @@ const claudeUsageWindows = (usage) => {
|
|
|
91
93
|
throw new Error('Unsupported Claude usage limits.');
|
|
92
94
|
return Array.isArray(limits) && limits.length ? limitWindows(limits) : { windows: keyedWindows(usage), unsupported: [] };
|
|
93
95
|
};
|
|
94
|
-
/**
|
|
96
|
+
/**
|
|
97
|
+
* How long a session reuses an account's profile. The watch polls every few minutes, and the profile (plan,
|
|
98
|
+
* organization, billing type) changes far more rarely, so it is read at most hourly there.
|
|
99
|
+
*/
|
|
100
|
+
const PROFILE_REUSE_MS = 3_600_000;
|
|
101
|
+
const REQUEST_TIMEOUT_MS = 10_000;
|
|
102
|
+
const MISMATCH = 'Claude returned a different account or organization; no account data was displayed.';
|
|
103
|
+
/**
|
|
104
|
+
* Claude Code's read-only OAuth account endpoints: the profile and usage of one login, with the access token it
|
|
105
|
+
* carries. It never refreshes that token; `ClaudeCodeHarness` refreshes a saved login first, and leaves the active
|
|
106
|
+
* login's tokens to Claude Code. No inference or browser session is used.
|
|
107
|
+
*/
|
|
95
108
|
export class ClaudeAccountStatus {
|
|
96
109
|
fetcher;
|
|
97
|
-
|
|
110
|
+
now;
|
|
111
|
+
constructor(fetcher = globalThis.fetch, now = Date.now) {
|
|
98
112
|
this.fetcher = fetcher;
|
|
113
|
+
this.now = now;
|
|
114
|
+
}
|
|
115
|
+
async get(route, accessToken, signal) {
|
|
116
|
+
const { status, body } = await claudeRequest(this.fetcher, {
|
|
117
|
+
url: `https://api.anthropic.com/api/oauth/${route}`, method: 'GET', subject: 'Claude account', timeoutMs: REQUEST_TIMEOUT_MS, signal, now: this.now,
|
|
118
|
+
headers: { Authorization: `Bearer ${accessToken}`, 'Content-Type': 'application/json',
|
|
119
|
+
...(route === 'usage' ? { 'anthropic-beta': 'oauth-2025-04-20' } : { 'Cache-Control': 'no-cache' }) },
|
|
120
|
+
});
|
|
121
|
+
if (status === 401)
|
|
122
|
+
throw new ClaudeLoginRejectedError();
|
|
123
|
+
if (status < 200 || status > 299)
|
|
124
|
+
throw new ClaudeRequestError(`Claude account service returned HTTP ${status}.`);
|
|
125
|
+
if (body === null)
|
|
126
|
+
throw new ClaudeRequestError('The Claude account service returned invalid data.');
|
|
127
|
+
return body;
|
|
99
128
|
}
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
const
|
|
129
|
+
/** The profile, from the session while it is younger than an hour; the session key is a hash of the token, never the token. */
|
|
130
|
+
profile(token, account, optionsArg) {
|
|
131
|
+
const lookup = () => this.lookupProfile(token, account, optionsArg.signal);
|
|
132
|
+
return optionsArg.session ? optionsArg.session.reuse(`claude:profile:${credentialHash(token)}`, PROFILE_REUSE_MS, lookup) : lookup();
|
|
133
|
+
}
|
|
134
|
+
/** A rejected login and an unsupported or foreign profile are answers; a rate limit or a failed request is thrown. */
|
|
135
|
+
async lookupProfile(token, account, signal) {
|
|
136
|
+
let body;
|
|
103
137
|
try {
|
|
104
|
-
|
|
105
|
-
method: 'GET', redirect: 'error', signal,
|
|
106
|
-
headers: { Authorization: `Bearer ${accessToken}`, 'Content-Type': 'application/json',
|
|
107
|
-
...(route === 'usage' ? { 'anthropic-beta': 'oauth-2025-04-20' } : { 'Cache-Control': 'no-cache' }) },
|
|
108
|
-
});
|
|
109
|
-
if (!response.ok) {
|
|
110
|
-
await response.body?.cancel();
|
|
111
|
-
throw new ClaudeStatusError(response.status === 401 ? 'Login expired or was rejected. Log in again with Claude Code and save it.' : `Claude account service returned HTTP ${response.status}.`);
|
|
112
|
-
}
|
|
113
|
-
const reader = response.body?.getReader();
|
|
114
|
-
if (!reader)
|
|
115
|
-
throw new ClaudeStatusError('The Claude account service returned an empty response.');
|
|
116
|
-
const chunks = [];
|
|
117
|
-
let size = 0;
|
|
118
|
-
try {
|
|
119
|
-
while (true) {
|
|
120
|
-
const part = await reader.read();
|
|
121
|
-
if (part.done)
|
|
122
|
-
break;
|
|
123
|
-
size += part.value.byteLength;
|
|
124
|
-
if (size > 1024 * 1024) {
|
|
125
|
-
await reader.cancel();
|
|
126
|
-
throw new ClaudeStatusError('The Claude account response is too large.');
|
|
127
|
-
}
|
|
128
|
-
chunks.push(part.value);
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
finally {
|
|
132
|
-
reader.releaseLock();
|
|
133
|
-
}
|
|
134
|
-
try {
|
|
135
|
-
return credentialRecord(JSON.parse(Buffer.concat(chunks).toString('utf8')));
|
|
136
|
-
}
|
|
137
|
-
catch {
|
|
138
|
-
throw new ClaudeStatusError('The Claude account service returned invalid data.');
|
|
139
|
-
}
|
|
138
|
+
body = await this.get('profile', token, signal);
|
|
140
139
|
}
|
|
141
140
|
catch (error) {
|
|
142
|
-
if (
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
141
|
+
if (error instanceof ClaudeLoginRejectedError)
|
|
142
|
+
return { kind: 'unavailable', problem: `Profile: ${error.message}` };
|
|
143
|
+
throw error;
|
|
144
|
+
}
|
|
145
|
+
try {
|
|
146
|
+
const user = credentialRecord(body.account);
|
|
147
|
+
const organization = credentialRecord(body.organization);
|
|
148
|
+
if (user.uuid !== account.accountUuid || organization.uuid !== account.organizationUuid)
|
|
149
|
+
return { kind: 'mismatch' };
|
|
150
|
+
const facts = [];
|
|
151
|
+
for (const [label, value] of [['Email', user.email], ['Organization', organization.name], ['Billing type', organization.billing_type], ['Seat tier', organization.seat_tier]]) {
|
|
152
|
+
if (credentialText(value))
|
|
153
|
+
facts.push({ section: 'Account', label: String(label), value: String(value) });
|
|
154
|
+
}
|
|
155
|
+
return { kind: 'found', plan: credentialText(organization.organization_type)?.replace(/^claude_/, ''), facts };
|
|
147
156
|
}
|
|
157
|
+
catch {
|
|
158
|
+
return { kind: 'unavailable', problem: 'Claude profile response is unsupported; no profile values were inferred.' };
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
/** The plan the login was saved with, the only one known while the service cannot be asked. */
|
|
162
|
+
storedSummary(oauth) {
|
|
163
|
+
const plan = credentialText(oauth.subscriptionType);
|
|
164
|
+
return plan ? { summary: { subscription: { plan, source: 'stored' } } } : {};
|
|
165
|
+
}
|
|
166
|
+
/** A login that could not be made usable for a lookup: its stored plan and why, with the service's retry time for a rate limit. */
|
|
167
|
+
unavailable(oauth, problem, rateLimit) {
|
|
168
|
+
return { facts: [], problems: [problem], ...this.storedSummary(oauth), ...(rateLimit ? { rateLimit } : {}) };
|
|
148
169
|
}
|
|
149
170
|
async read(oauth, account, optionsArg = {}) {
|
|
150
|
-
const result = { facts: [], problems: [] };
|
|
151
|
-
const storedPlan = credentialText(oauth.subscriptionType);
|
|
152
|
-
if (storedPlan)
|
|
153
|
-
result.summary = { subscription: { plan: storedPlan, source: 'stored' } };
|
|
171
|
+
const result = { facts: [], problems: [], ...this.storedSummary(oauth) };
|
|
154
172
|
if (!Array.isArray(oauth.scopes) || !oauth.scopes.includes('user:profile')) {
|
|
155
173
|
result.facts.push({ section: 'Availability', label: 'Live account status', value: 'This login lacks the user:profile scope. Log in through Claude Code to obtain subscriber status.' });
|
|
156
174
|
return result;
|
|
@@ -158,27 +176,22 @@ export class ClaudeAccountStatus {
|
|
|
158
176
|
const token = credentialText(oauth.accessToken);
|
|
159
177
|
if (!token)
|
|
160
178
|
return { facts: [], problems: ['No usable Claude Code access token is available.'] };
|
|
161
|
-
const [profile, usage] = await Promise.allSettled([this.
|
|
179
|
+
const [profile, usage] = await Promise.allSettled([this.profile(token, account, optionsArg), this.get('usage', token, optionsArg.signal)]);
|
|
180
|
+
const failure = (reason) => reason instanceof ClaudeRequestError ? reason.message : 'Lookup failed.';
|
|
162
181
|
if (profile.status === 'fulfilled') {
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
if (plan)
|
|
170
|
-
result.summary = { ...result.summary, subscription: { plan, source: 'live' } };
|
|
171
|
-
|
|
172
|
-
if (credentialText(value))
|
|
173
|
-
result.facts.push({ section: 'Account', label: String(label), value: String(value) });
|
|
174
|
-
}
|
|
175
|
-
}
|
|
176
|
-
catch {
|
|
177
|
-
result.problems.push('Claude profile response is unsupported; no profile values were inferred.');
|
|
182
|
+
const found = profile.value;
|
|
183
|
+
if (found.kind === 'mismatch')
|
|
184
|
+
return { facts: [], problems: [MISMATCH] };
|
|
185
|
+
if (found.kind === 'unavailable')
|
|
186
|
+
result.problems.push(found.problem);
|
|
187
|
+
else {
|
|
188
|
+
if (found.plan)
|
|
189
|
+
result.summary = { ...result.summary, subscription: { plan: found.plan, source: 'live' } };
|
|
190
|
+
result.facts.push(...found.facts.map(fact => ({ ...fact })));
|
|
178
191
|
}
|
|
179
192
|
}
|
|
180
193
|
else
|
|
181
|
-
result.problems.push(`Profile: ${profile.reason
|
|
194
|
+
result.problems.push(`Profile: ${failure(profile.reason)}`);
|
|
182
195
|
if (usage.status === 'fulfilled') {
|
|
183
196
|
try {
|
|
184
197
|
const { windows, unsupported } = claudeUsageWindows(usage.value);
|
|
@@ -208,9 +221,13 @@ export class ClaudeAccountStatus {
|
|
|
208
221
|
}
|
|
209
222
|
}
|
|
210
223
|
else
|
|
211
|
-
result.problems.push(`Usage: ${usage.reason
|
|
212
|
-
|
|
224
|
+
result.problems.push(`Usage: ${failure(usage.reason)}`);
|
|
225
|
+
const limited = [profile, usage].flatMap(item => item.status === 'rejected' && item.reason instanceof ClaudeRateLimitError ? [item.reason] : []);
|
|
226
|
+
if (limited.length)
|
|
227
|
+
result.rateLimit = { retryAt: latestRetryAt(limited.map(error => error.retryAt)) };
|
|
228
|
+
// The missing renewal dates are the harness's `renewalUnavailableReason`, stated once by the views that show them.
|
|
229
|
+
result.facts.push({ section: 'Availability', label: 'Earned resets', value: 'authswitch does not read earned reset credits for Claude Code logins.' });
|
|
213
230
|
return result;
|
|
214
231
|
}
|
|
215
232
|
}
|
|
216
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.claudestatus.js","sourceRoot":"","sources":["../ts/classes.claudestatus.ts"],"names":[],"mappings":"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"}
|
|
233
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.claudestatus.js","sourceRoot":"","sources":["../ts/classes.claudestatus.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/** Claude Code 2.1.273's public OAuth client (`CLIENT_ID`, @12733057), used when a login does not name its own. */
|
|
2
|
+
export declare const CLAUDE_CODE_CLIENT_ID = "9d1c250a-e61b-44d9-88ed-5944d1962f5e";
|
|
3
|
+
/** The token fields a refresh replaces in a stored `claudeAiOauth`; every other field is kept. */
|
|
4
|
+
export interface IClaudeTokens {
|
|
5
|
+
accessToken: string;
|
|
6
|
+
refreshToken: string;
|
|
7
|
+
/** Milliseconds since the epoch, as Claude Code stores them. */
|
|
8
|
+
expiresAt: number;
|
|
9
|
+
refreshTokenExpiresAt?: number;
|
|
10
|
+
scopes?: string[];
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Refreshes a saved Claude Code login with the refresh-token grant Claude Code 2.1.273 uses (`RQ`, @15355055).
|
|
14
|
+
*
|
|
15
|
+
* It only talks to the token endpoint; which login is refreshed, and how the result is stored, belongs to the harness.
|
|
16
|
+
*/
|
|
17
|
+
export declare class ClaudeTokenRefresh {
|
|
18
|
+
private readonly fetcher;
|
|
19
|
+
private readonly now;
|
|
20
|
+
constructor(fetcher?: typeof fetch, now?: () => number);
|
|
21
|
+
/**
|
|
22
|
+
* Whether Claude Code would refresh this login before using it: its access token expires within five minutes. A
|
|
23
|
+
* login without a numeric expiry or without a refresh token is used as it is, exactly as Claude Code does.
|
|
24
|
+
*/
|
|
25
|
+
due(oauthArg: Record<string, unknown>): boolean;
|
|
26
|
+
/**
|
|
27
|
+
* New tokens for the login. A response without a refresh token keeps the one sent, and one without a scope keeps the
|
|
28
|
+
* stored scopes, as Claude Code merges them. Throws `ClaudeRequestError` with a fixed diagnostic; a grant the service
|
|
29
|
+
* rejects is `ClaudeLoginRejectedError`, and a rate limit is `ClaudeRateLimitError`.
|
|
30
|
+
*/
|
|
31
|
+
refresh(oauthArg: Record<string, unknown>): Promise<IClaudeTokens>;
|
|
32
|
+
}
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import { credentialText } from './classes.credentialstore.js';
|
|
2
|
+
import { claudeRequest, ClaudeLoginRejectedError, ClaudeRequestError } from './claudehttp.js';
|
|
3
|
+
/** Claude Code 2.1.273's token endpoint (`TOKEN_URL`, bundle offset @12733057; see hints.md). */
|
|
4
|
+
const TOKEN_URL = 'https://platform.claude.com/v1/oauth/token';
|
|
5
|
+
/** Claude Code 2.1.273's public OAuth client (`CLIENT_ID`, @12733057), used when a login does not name its own. */
|
|
6
|
+
export const CLAUDE_CODE_CLIENT_ID = '9d1c250a-e61b-44d9-88ed-5944d1962f5e';
|
|
7
|
+
/** Claude Code 2.1.273 refreshes an access token that expires within five minutes (`cF`, @15359182). */
|
|
8
|
+
const REFRESH_MARGIN_MS = 300_000;
|
|
9
|
+
/**
|
|
10
|
+
* Claude Code 2.1.273 allows a refresh 30 seconds. A refresh is never cut shorter than that, nor cancelled once sent:
|
|
11
|
+
* the service may already have replaced the refresh token the request carries.
|
|
12
|
+
*/
|
|
13
|
+
const REFRESH_TIMEOUT_MS = 30_000;
|
|
14
|
+
const seconds = (valueArg) => typeof valueArg === 'number' && Number.isFinite(valueArg) && valueArg >= 0 ? valueArg : undefined;
|
|
15
|
+
/**
|
|
16
|
+
* Refreshes a saved Claude Code login with the refresh-token grant Claude Code 2.1.273 uses (`RQ`, @15355055).
|
|
17
|
+
*
|
|
18
|
+
* It only talks to the token endpoint; which login is refreshed, and how the result is stored, belongs to the harness.
|
|
19
|
+
*/
|
|
20
|
+
export class ClaudeTokenRefresh {
|
|
21
|
+
fetcher;
|
|
22
|
+
now;
|
|
23
|
+
constructor(fetcher = globalThis.fetch, now = Date.now) {
|
|
24
|
+
this.fetcher = fetcher;
|
|
25
|
+
this.now = now;
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Whether Claude Code would refresh this login before using it: its access token expires within five minutes. A
|
|
29
|
+
* login without a numeric expiry or without a refresh token is used as it is, exactly as Claude Code does.
|
|
30
|
+
*/
|
|
31
|
+
due(oauthArg) {
|
|
32
|
+
const expiresAt = oauthArg.expiresAt;
|
|
33
|
+
return typeof expiresAt === 'number' && Number.isFinite(expiresAt) && credentialText(oauthArg.refreshToken) !== undefined
|
|
34
|
+
&& this.now() + REFRESH_MARGIN_MS >= expiresAt;
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* New tokens for the login. A response without a refresh token keeps the one sent, and one without a scope keeps the
|
|
38
|
+
* stored scopes, as Claude Code merges them. Throws `ClaudeRequestError` with a fixed diagnostic; a grant the service
|
|
39
|
+
* rejects is `ClaudeLoginRejectedError`, and a rate limit is `ClaudeRateLimitError`.
|
|
40
|
+
*/
|
|
41
|
+
async refresh(oauthArg) {
|
|
42
|
+
const refreshToken = credentialText(oauthArg.refreshToken);
|
|
43
|
+
const scopes = oauthArg.scopes;
|
|
44
|
+
if (!refreshToken || !Array.isArray(scopes) || !scopes.every(scope => typeof scope === 'string')) {
|
|
45
|
+
throw new ClaudeRequestError('This saved login has no refresh token or scopes to refresh with. Log in again with Claude Code and save it.');
|
|
46
|
+
}
|
|
47
|
+
const { status, body } = await claudeRequest(this.fetcher, {
|
|
48
|
+
url: TOKEN_URL, method: 'POST', headers: { 'Content-Type': 'application/json' }, subject: 'Claude sign-in',
|
|
49
|
+
body: JSON.stringify({
|
|
50
|
+
grant_type: 'refresh_token', refresh_token: refreshToken,
|
|
51
|
+
client_id: credentialText(oauthArg.clientId) ?? CLAUDE_CODE_CLIENT_ID, scope: scopes.join(' '),
|
|
52
|
+
}),
|
|
53
|
+
timeoutMs: REFRESH_TIMEOUT_MS, readErrorBody: true, now: this.now,
|
|
54
|
+
});
|
|
55
|
+
if ((status === 400 || status === 401) && body?.error === 'invalid_grant')
|
|
56
|
+
throw new ClaudeLoginRejectedError();
|
|
57
|
+
if (status < 200 || status > 299)
|
|
58
|
+
throw new ClaudeRequestError(`The Claude sign-in service returned HTTP ${status}.`);
|
|
59
|
+
const receivedAt = this.now();
|
|
60
|
+
const accessToken = credentialText(body?.access_token);
|
|
61
|
+
const tokenType = body?.token_type;
|
|
62
|
+
const expiresIn = seconds(body?.expires_in);
|
|
63
|
+
const refreshExpiresIn = body?.refresh_token_expires_in == null ? null : seconds(body.refresh_token_expires_in);
|
|
64
|
+
const rotated = body?.refresh_token == null ? null : credentialText(body.refresh_token);
|
|
65
|
+
const scope = body?.scope == null ? null : typeof body.scope === 'string' ? body.scope.split(/\s+/).filter(Boolean) : undefined;
|
|
66
|
+
if (!accessToken || (tokenType != null && (typeof tokenType !== 'string' || tokenType.toLowerCase() !== 'bearer'))
|
|
67
|
+
|| expiresIn === undefined || refreshExpiresIn === undefined || rotated === undefined || scope === undefined) {
|
|
68
|
+
throw new ClaudeRequestError('The Claude sign-in service returned an unsupported token response; the saved login was not changed.');
|
|
69
|
+
}
|
|
70
|
+
return {
|
|
71
|
+
accessToken, refreshToken: rotated ?? refreshToken, expiresAt: receivedAt + expiresIn * 1000,
|
|
72
|
+
...(refreshExpiresIn === null ? {} : { refreshTokenExpiresAt: receivedAt + refreshExpiresIn * 1000 }),
|
|
73
|
+
...(scope === null || !scope.length ? {} : { scopes: scope }),
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5jbGF1ZGV0b2tlbnJlZnJlc2guanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jbGFzc2VzLmNsYXVkZXRva2VucmVmcmVzaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDOUQsT0FBTyxFQUFFLGFBQWEsRUFBRSx3QkFBd0IsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRTlGLGlHQUFpRztBQUNqRyxNQUFNLFNBQVMsR0FBRyw0Q0FBNEMsQ0FBQztBQUMvRCxtSEFBbUg7QUFDbkgsTUFBTSxDQUFDLE1BQU0scUJBQXFCLEdBQUcsc0NBQXNDLENBQUM7QUFDNUUsd0dBQXdHO0FBQ3hHLE1BQU0saUJBQWlCLEdBQUcsT0FBTyxDQUFDO0FBQ2xDOzs7R0FHRztBQUNILE1BQU0sa0JBQWtCLEdBQUcsTUFBTSxDQUFDO0FBWWxDLE1BQU0sT0FBTyxHQUFHLENBQUMsUUFBaUIsRUFBc0IsRUFBRSxDQUN4RCxPQUFPLFFBQVEsS0FBSyxRQUFRLElBQUksTUFBTSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsSUFBSSxRQUFRLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztBQUVwRzs7OztHQUlHO0FBQ0gsTUFBTSxPQUFPLGtCQUFrQjtJQUNBO0lBQTJEO0lBQXhGLFlBQTZCLFVBQXdCLFVBQVUsQ0FBQyxLQUFLLEVBQW1CLE1BQW9CLElBQUksQ0FBQyxHQUFHO1FBQXZGLFlBQU8sR0FBUCxPQUFPLENBQWlDO1FBQW1CLFFBQUcsR0FBSCxHQUFHLENBQXlCO0lBQUcsQ0FBQztJQUV4SDs7O09BR0c7SUFDSSxHQUFHLENBQUMsUUFBaUM7UUFDMUMsTUFBTSxTQUFTLEdBQUcsUUFBUSxDQUFDLFNBQVMsQ0FBQztRQUNyQyxPQUFPLE9BQU8sU0FBUyxLQUFLLFFBQVEsSUFBSSxNQUFN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
|
package/dist_ts/classes.cli.d.ts
CHANGED
|
@@ -19,14 +19,21 @@ export declare class AuthSwitchCli {
|
|
|
19
19
|
* Decide what happens to the harness's own running instances before its credential file changes.
|
|
20
20
|
*
|
|
21
21
|
* The switch itself no longer depends on this: it writes atomically and re-saves the outgoing
|
|
22
|
-
* login either way.
|
|
23
|
-
*
|
|
24
|
-
*
|
|
25
|
-
*
|
|
22
|
+
* login either way. A harness that picks up swaps live needs nothing here, so its instances are
|
|
23
|
+
* only stopped on an explicit --stop or --force-stop. Any other running instance still costs
|
|
24
|
+
* durability -- it holds the previous login in memory and can write it back at its next refresh --
|
|
25
|
+
* so the instances are named and stopping them is offered, never assumed. Without a terminal and
|
|
26
|
+
* without a flag nothing is signalled, and only pids enumerated here for this user are ever
|
|
27
|
+
* signalled at all.
|
|
26
28
|
*/
|
|
27
29
|
private settleRunningInstances;
|
|
28
30
|
private commandLogin;
|
|
29
31
|
private commandPreuse;
|
|
32
|
+
/**
|
|
33
|
+
* Watch usage and switch automatically; see `AuthSwitchWatch`. SIGINT and SIGTERM end it cleanly with status 0.
|
|
34
|
+
* `--once` runs one check and exits 1 when a switch it attempted did not complete.
|
|
35
|
+
*/
|
|
36
|
+
private commandWatch;
|
|
30
37
|
private selectHarness;
|
|
31
38
|
private runInteractive;
|
|
32
39
|
/** Offer a verified save before presenting the switch picker; declining never switches. */
|
|
@@ -36,12 +43,12 @@ export declare class AuthSwitchCli {
|
|
|
36
43
|
private selectActive;
|
|
37
44
|
private reportOutcome;
|
|
38
45
|
/**
|
|
39
|
-
* The condensed views are projections of the same
|
|
40
|
-
* once, per account, with the same bounded timeouts and per-account failure
|
|
46
|
+
* The condensed views are projections of the same account list, which never changes which account is in
|
|
47
|
+
* use, so a provider is queried once, per account, with the same bounded timeouts and per-account failure
|
|
48
|
+
* isolation as `list`.
|
|
41
49
|
*/
|
|
42
50
|
private commandCondensed;
|
|
43
51
|
private commandList;
|
|
44
|
-
private printAccount;
|
|
45
52
|
private resolveAccount;
|
|
46
53
|
/**
|
|
47
54
|
* Activate a saved account and report what is now active with its badge.
|