agl 43.1.0 → 43.2.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/changelog.md +12 -0
- package/dist_serve/bundle.js +5329 -5116
- package/dist_serve/bundle.js.map +2 -2
- package/dist_serve/bundle.js.third-party-notices.json +30 -30
- package/dist_serve/bundle.js.third-party-notices.txt +30 -30
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/aglapi/aglapisurface.document.js +325 -1
- package/dist_ts/aglapi/interfaces.d.ts +3 -0
- package/dist_ts/aglapi/interfaces.js +2 -1
- package/dist_ts/classes.authmodels.js +17 -4
- package/dist_ts/classes.authstore.js +16 -2
- package/dist_ts/classes.cli.d.ts +4 -2
- package/dist_ts/classes.cli.js +6 -3
- package/dist_ts/classes.controller.d.ts +10 -0
- package/dist_ts/classes.controller.js +119 -4
- package/dist_ts/classes.controllermanagement.d.ts +14 -4
- package/dist_ts/classes.controllermanagement.js +20 -2
- package/dist_ts/classes.gatewayclient.d.ts +115 -0
- package/dist_ts/classes.gatewayclient.js +336 -0
- package/dist_ts/classes.gatewayclientstore.d.ts +97 -0
- package/dist_ts/classes.gatewayclientstore.js +261 -0
- package/dist_ts/classes.inferencerouter.d.ts +9 -0
- package/dist_ts/classes.inferencerouter.js +11 -1
- package/dist_ts/classes.inferenceservice.d.ts +9 -0
- package/dist_ts/classes.inferenceservice.js +27 -1
- package/dist_ts/classes.mcpclient.d.ts +4 -1
- package/dist_ts/classes.mcpclient.js +19 -1
- package/dist_ts/classes.mcpcontrollerhost.d.ts +3 -1
- package/dist_ts/classes.mcpcontrollerhost.js +9 -1
- package/dist_ts/classes.mcptools.d.ts +3 -3
- package/dist_ts/classes.mcptools.js +26 -1
- package/dist_ts/classes.mcpvalidation.js +7 -1
- package/dist_ts/classes.proxycontrol.d.ts +11 -0
- package/dist_ts/classes.proxycontrol.js +7 -1
- package/dist_ts/classes.proxycontrolclient.d.ts +17 -0
- package/dist_ts/classes.proxycontrolclient.js +35 -1
- package/dist_ts/classes.proxydaemon.js +8 -1
- package/dist_ts/classes.proxymonitor.d.ts +7 -0
- package/dist_ts/classes.proxymonitor.js +13 -1
- package/dist_ts/classes.trustedproxysecrets.d.ts +2 -0
- package/dist_ts/classes.trustedproxysecrets.js +5 -1
- package/dist_ts/functions.controllermanagementsurface.d.ts +4 -0
- package/dist_ts/functions.controllermanagementsurface.js +15 -1
- package/dist_ts/functions.gatewaycli.d.ts +24 -0
- package/dist_ts/functions.gatewaycli.js +395 -0
- package/dist_ts/functions.gatewayroute.d.ts +135 -0
- package/dist_ts/functions.gatewayroute.js +366 -0
- package/dist_ts/functions.inferencecli.js +30 -1
- package/dist_ts/functions.inferencecliarguments.d.ts +8 -2
- package/dist_ts/functions.inferencecliarguments.js +31 -3
- package/dist_ts/functions.proxycapacity.d.ts +50 -0
- package/dist_ts/functions.proxycapacity.js +142 -0
- package/dist_ts/functions.proxycapacitycli.d.ts +30 -0
- package/dist_ts/functions.proxycapacitycli.js +65 -0
- package/dist_ts/functions.remotecli.d.ts +30 -3
- package/dist_ts/functions.remotecli.js +44 -18
- package/dist_ts/interfaces.auth.d.ts +25 -4
- package/dist_ts/interfaces.auth.js +7 -1
- package/dist_ts/plugins.d.ts +2 -0
- package/dist_ts/plugins.js +4 -1
- package/dist_ts_authswitch/authority-placement.js +3 -17
- package/dist_ts_authswitch/authority-usagelimit.d.ts +29 -0
- package/dist_ts_authswitch/authority-usagelimit.js +66 -2
- package/dist_ts_authswitch/authority-usagewindows.d.ts +6 -0
- package/dist_ts_authswitch/authority-usagewindows.js +15 -1
- package/dist_ts_interfaces/gateway.d.ts +151 -0
- package/dist_ts_interfaces/gateway.js +66 -0
- package/dist_ts_interfaces/index.d.ts +2 -0
- package/dist_ts_interfaces/index.js +3 -1
- package/dist_ts_interfaces/management.d.ts +4 -4
- package/dist_ts_interfaces/management.js +3 -2
- package/dist_ts_interfaces/mcprequests.d.ts +14 -2
- package/dist_ts_interfaces/mcprequests.js +2 -1
- package/dist_ts_interfaces/proxycapacity.d.ts +99 -0
- package/dist_ts_interfaces/proxycapacity.js +74 -0
- package/package.json +4 -3
- package/readme.md +79 -5
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/aglapi/aglapisurface.document.ts +324 -0
- package/ts/aglapi/interfaces.ts +1 -0
- package/ts/classes.authmodels.ts +22 -3
- package/ts/classes.authstore.ts +15 -1
- package/ts/classes.cli.ts +7 -3
- package/ts/classes.controller.ts +134 -3
- package/ts/classes.controllermanagement.ts +40 -7
- package/ts/classes.gatewayclient.ts +401 -0
- package/ts/classes.gatewayclientstore.ts +272 -0
- package/ts/classes.inferencerouter.ts +12 -0
- package/ts/classes.inferenceservice.ts +27 -0
- package/ts/classes.mcpclient.ts +18 -0
- package/ts/classes.mcpcontrollerhost.ts +13 -0
- package/ts/classes.mcptools.ts +30 -2
- package/ts/classes.mcpvalidation.ts +5 -0
- package/ts/classes.proxycontrol.ts +16 -0
- package/ts/classes.proxycontrolclient.ts +30 -0
- package/ts/classes.proxydaemon.ts +8 -0
- package/ts/classes.proxymonitor.ts +12 -0
- package/ts/classes.trustedproxysecrets.ts +5 -0
- package/ts/functions.controllermanagementsurface.ts +15 -0
- package/ts/functions.gatewaycli.ts +436 -0
- package/ts/functions.gatewayroute.ts +429 -0
- package/ts/functions.inferencecli.ts +24 -0
- package/ts/functions.inferencecliarguments.ts +30 -4
- package/ts/functions.proxycapacity.ts +191 -0
- package/ts/functions.proxycapacitycli.ts +104 -0
- package/ts/functions.remotecli.ts +56 -20
- package/ts/interfaces.auth.ts +28 -4
- package/ts/plugins.ts +5 -0
- package/ts_authswitch/authority-placement.ts +2 -15
- package/ts_authswitch/authority-usagelimit.ts +84 -1
- package/ts_authswitch/authority-usagewindows.ts +13 -0
- package/ts_interfaces/gateway.ts +242 -0
- package/ts_interfaces/index.ts +2 -0
- package/ts_interfaces/management.ts +6 -4
- package/ts_interfaces/mcprequests.ts +18 -0
- package/ts_interfaces/proxycapacity.ts +162 -0
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/classes.browserpresentation.ts +13 -5
- package/ts_web/elements.accounts.ts +40 -113
- package/ts_web/elements.configurationpane.ts +24 -37
- package/ts_web/elements.devices.ts +4 -17
- package/ts_web/elements.flexlimitstrip.ts +21 -70
- package/ts_web/elements.harnesscontrollerapp.ts +91 -185
|
@@ -8,6 +8,7 @@ export const inferenceCliHelp = `Usage:
|
|
|
8
8
|
agl proxy service install [--port ${aglProxyDefaultPort}] | enable | start | stop | status
|
|
9
9
|
agl proxy serve [--port ${aglProxyDefaultPort}]
|
|
10
10
|
agl proxy status [--json]
|
|
11
|
+
agl proxy capacity [--provider anthropic|openai] [--min-headroom 15] [--json] [--wait [--max-seconds <seconds>]]
|
|
11
12
|
agl proxy credential <client> [--provider openai|anthropic] [--delivery file|none] [--write <path>] [--rotate] | --version
|
|
12
13
|
agl proxy run codex|claude|opencode [--provider openai|anthropic] [--account <id>] [--plan <name>] [--model <id>] -- [harness arguments]
|
|
13
14
|
agl proxy confined run [--provider anthropic|openai] -- docker run [docker options] <image> [command]
|
|
@@ -41,6 +42,14 @@ on 127.0.0.1:${aglProxyRelayDefaultPort} inside the container, which therefore k
|
|
|
41
42
|
and --network container:… are refused. It passes AGL_PROXY_SOCKET and MODELPROFILE_PROXY_TOKEN, and no model.
|
|
42
43
|
confined end ends a run's credential at once, and its launcher stops the container; agl proxy status lists the runs
|
|
43
44
|
with their harnesses and pools.
|
|
45
|
+
capacity answers each pool's room for new work: the headroom its members add now, summed. Its members are its
|
|
46
|
+
subscription sign-ins that have not lapsed and whose reading states a counted plan (Claude accounts: max; ChatGPT
|
|
47
|
+
accounts: every plan but free); one that takes no work now adds nothing. A pool is open when its room reaches
|
|
48
|
+
--min-headroom (15 unless given) and no provider 429 hit a member within five minutes (a proxy watches for five minutes
|
|
49
|
+
after its start before it says so); otherwise it waits until the first moment the members' readings foresee enough room.
|
|
50
|
+
Each member names its binding window and when its headroom next grows. Exit status: 0 when every pool reported is open,
|
|
51
|
+
2 when one waits, 1 on a failure. --wait (with --provider) asks again until the pool is open, at most --max-seconds when
|
|
52
|
+
given, and exits 2 when that time ran out.
|
|
44
53
|
Repeat --account or --plan to restrict automatic routing. Only accounts the account service holds are eligible.
|
|
45
54
|
ChatGPT pools: /openai/v1/responses, /anthropic/v1/messages (translated), and each prefix's /models.
|
|
46
55
|
Claude pools: /anthropic/v1/messages, /anthropic/v1/messages/count_tokens and /anthropic/v1/models, sent on as Claude Code sent them.
|
|
@@ -54,17 +63,18 @@ const commandOptions = {
|
|
|
54
63
|
run: ['--provider', '--account', '--plan', '--model'],
|
|
55
64
|
credential: ['--provider', '--delivery', '--write', '--rotate'],
|
|
56
65
|
status: ['--json'],
|
|
66
|
+
capacity: ['--provider', '--min-headroom', '--json', '--wait', '--max-seconds'],
|
|
57
67
|
service: ['--port'],
|
|
58
68
|
confined: [],
|
|
59
69
|
};
|
|
60
|
-
const flags = new Set(['--rotate', '--json']);
|
|
70
|
+
const flags = new Set(['--rotate', '--json', '--wait']);
|
|
61
71
|
export const parseInferenceCliArguments = (argvArg) => {
|
|
62
72
|
const argv = [...argvArg];
|
|
63
73
|
const command = argv.shift();
|
|
64
74
|
if (!command || !Object.hasOwn(commandOptions, command))
|
|
65
75
|
throw new Error(inferenceCliHelp);
|
|
66
76
|
const result = { command, port: aglProxyDefaultPort, policy: {}, rotate: false, version: false, json: false,
|
|
67
|
-
args: [] };
|
|
77
|
+
wait: false, args: [] };
|
|
68
78
|
if (command === 'run') {
|
|
69
79
|
const harness = argv.shift();
|
|
70
80
|
if (!['codex', 'claude', 'opencode'].includes(harness ?? ''))
|
|
@@ -140,6 +150,8 @@ export const parseInferenceCliArguments = (argvArg) => {
|
|
|
140
150
|
if (flags.has(name)) {
|
|
141
151
|
if (name === '--rotate')
|
|
142
152
|
result.rotate = true;
|
|
153
|
+
else if (name === '--wait')
|
|
154
|
+
result.wait = true;
|
|
143
155
|
else
|
|
144
156
|
result.json = true;
|
|
145
157
|
continue;
|
|
@@ -172,6 +184,16 @@ export const parseInferenceCliArguments = (argvArg) => {
|
|
|
172
184
|
throw new Error('--delivery is file or none.');
|
|
173
185
|
result.delivery = value;
|
|
174
186
|
}
|
|
187
|
+
else if (name === '--min-headroom') {
|
|
188
|
+
if (!/^\d+$/.test(value) || !Number.isSafeInteger(Number(value)))
|
|
189
|
+
throw new Error('--min-headroom is a whole percent, 0 or more.');
|
|
190
|
+
result.minHeadroom = Number(value);
|
|
191
|
+
}
|
|
192
|
+
else if (name === '--max-seconds') {
|
|
193
|
+
if (!/^[1-9]\d*$/.test(value) || !Number.isSafeInteger(Number(value)))
|
|
194
|
+
throw new Error('--max-seconds is a whole number of seconds, 1 or more.');
|
|
195
|
+
result.maxSeconds = Number(value);
|
|
196
|
+
}
|
|
175
197
|
else if (name === '--write') {
|
|
176
198
|
if (!path.isAbsolute(value))
|
|
177
199
|
throw new Error('--write needs an absolute path.');
|
|
@@ -183,6 +205,12 @@ export const parseInferenceCliArguments = (argvArg) => {
|
|
|
183
205
|
result.modelId = value;
|
|
184
206
|
}
|
|
185
207
|
}
|
|
208
|
+
if (command === 'capacity') {
|
|
209
|
+
if (result.wait && result.provider === undefined)
|
|
210
|
+
throw new Error('--wait waits for one pool: name it with --provider.');
|
|
211
|
+
if (result.maxSeconds !== undefined && !result.wait)
|
|
212
|
+
throw new Error('--max-seconds bounds --wait, which it needs.');
|
|
213
|
+
}
|
|
186
214
|
if (accounts.length > 64 || plans.length > 32)
|
|
187
215
|
throw new Error('The proxy policy exceeds its account or plan limit.');
|
|
188
216
|
if (accounts.length)
|
|
@@ -197,4 +225,4 @@ export const parseInferenceCliArguments = (argvArg) => {
|
|
|
197
225
|
}
|
|
198
226
|
return result;
|
|
199
227
|
};
|
|
200
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
228
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"functions.inferencecliarguments.js","sourceRoot":"","sources":["../../ts/functions.inferencecliarguments.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
import type { IInferenceAccountStatus } from './classes.inferencerouter.js';
|
|
3
|
+
import { type IProxyCapacityPool, type TProxyCapacityProvider } from '../dist_ts_interfaces/proxycapacity.js';
|
|
4
|
+
/**
|
|
5
|
+
* Which plans a pool counts, by the plan name its member's held reading states: `only` the plans listed, or every plan
|
|
6
|
+
* `except` them. A Claude account counts on Max alone (Anthropic's `organization_type` `claude_max`, both Max tiers;
|
|
7
|
+
* Claude Code reads the tier apart, from `rate_limit_tier`), a ChatGPT account on every plan but Free.
|
|
8
|
+
*/
|
|
9
|
+
export interface IProxyCapacityPlanRule {
|
|
10
|
+
counts: 'only' | 'except';
|
|
11
|
+
plans: readonly string[];
|
|
12
|
+
}
|
|
13
|
+
export declare const proxyCapacityPlans: Readonly<Record<TProxyCapacityProvider, IProxyCapacityPlanRule>>;
|
|
14
|
+
/** Whether a pool counts an account of the plan `planArg` names. */
|
|
15
|
+
export declare const proxyCapacityPlanCounts: (providerArg: TProxyCapacityProvider, planArg: string) => boolean;
|
|
16
|
+
/** The plan a held reading of the pool's kind states, whatever its age; `null` without one. */
|
|
17
|
+
export declare const proxyCapacityHeldPlan: (providerArg: TProxyCapacityProvider, usageArg: plugins.authswitchAuthority.IAuthSwitchUsageSnapshot | undefined) => string | null;
|
|
18
|
+
/** One account of the proxy as the capacity judges it. */
|
|
19
|
+
export interface IProxyCapacityAccount {
|
|
20
|
+
/** As `InferenceRouter.accountStatus` judged it. */
|
|
21
|
+
status: IInferenceAccountStatus;
|
|
22
|
+
/** The usage reading the status judged it on, or `undefined` while none is held. */
|
|
23
|
+
usage: plugins.authswitchAuthority.IAuthSwitchUsageSnapshot | undefined;
|
|
24
|
+
/** The newest provider 429 on it the proxy saw (epoch milliseconds), or `null`; and until when it rests after one (0: it does not). */
|
|
25
|
+
quota: {
|
|
26
|
+
lastAt: number | null;
|
|
27
|
+
restUntil: number;
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
export interface IProxyCapacityOptions {
|
|
31
|
+
/** The room the pool needs: a non-negative integer, in headroom percent summed over its members. */
|
|
32
|
+
minHeadroom: number;
|
|
33
|
+
/** Since when the proxy observes provider 429s (epoch milliseconds): its start. */
|
|
34
|
+
observedSince: number;
|
|
35
|
+
/** Epoch milliseconds. */
|
|
36
|
+
now: number;
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* A pool's room for new work (AGL-1097). Its members are the pool's subscription sign-ins that have not lapsed and whose
|
|
40
|
+
* held reading states a plan the pool counts (`proxyCapacityPlans`), stale or not; API keys never count. The room is
|
|
41
|
+
* the headroom its members add now (see `projectMember`), summed.
|
|
42
|
+
*
|
|
43
|
+
* The pool is open when the room reaches `minHeadroom` and it is quiet: no provider 429 on a member within
|
|
44
|
+
* `proxyCapacityQuietMs`, which the proxy can say only once it has observed that long. Otherwise it waits until the
|
|
45
|
+
* first moment the members' readings foresee the room at the minimum once it is quiet (`room`), or until it is quiet when
|
|
46
|
+
* the room is there by then (`provider-429`, or `quiet-unobserved` while the proxy has not observed long enough); with
|
|
47
|
+
* no such moment foreseen, without an end (`until` and `seconds` `null`). Each projected moment is the earliest the room
|
|
48
|
+
* can be there, as no reading foresees the usage spent meanwhile.
|
|
49
|
+
*/
|
|
50
|
+
export declare const proxyPoolCapacity: (providerArg: TProxyCapacityProvider, accountsArg: readonly IProxyCapacityAccount[], optionsArg: IProxyCapacityOptions) => IProxyCapacityPool;
|
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
import { proxyCapacityQuietMs, } from '../dist_ts_interfaces/proxycapacity.js';
|
|
3
|
+
export const proxyCapacityPlans = {
|
|
4
|
+
anthropic: { counts: 'only', plans: ['max'] },
|
|
5
|
+
openai: { counts: 'except', plans: ['free'] },
|
|
6
|
+
};
|
|
7
|
+
/** Whether a pool counts an account of the plan `planArg` names. */
|
|
8
|
+
export const proxyCapacityPlanCounts = (providerArg, planArg) => {
|
|
9
|
+
const rule = proxyCapacityPlans[providerArg];
|
|
10
|
+
return rule.plans.includes(planArg) === (rule.counts === 'only');
|
|
11
|
+
};
|
|
12
|
+
/** The plan a held reading of the pool's kind states, whatever its age; `null` without one. */
|
|
13
|
+
export const proxyCapacityHeldPlan = (providerArg, usageArg) => {
|
|
14
|
+
const reading = usageArg?.reading;
|
|
15
|
+
if (providerArg === 'anthropic')
|
|
16
|
+
return reading?.kind === 'anthropic' ? reading.status.plan?.name || null : null;
|
|
17
|
+
return reading?.kind === 'openai' ? reading.rateLimits.plan || null : null;
|
|
18
|
+
};
|
|
19
|
+
/** What a projection adds to the room at `atArg`, no earlier than now. */
|
|
20
|
+
const headroomAt = (projectionArg, atArg) => {
|
|
21
|
+
let headroom = projectionArg.now;
|
|
22
|
+
for (const step of projectionArg.steps) {
|
|
23
|
+
if (step.at > atArg)
|
|
24
|
+
break;
|
|
25
|
+
headroom = step.headroom;
|
|
26
|
+
}
|
|
27
|
+
return headroom;
|
|
28
|
+
};
|
|
29
|
+
const iso = (atArg) => new Date(atArg).toISOString();
|
|
30
|
+
const capacityWindow = (windowArg) => ({
|
|
31
|
+
name: plugins.authswitchUsageWindows.authSwitchUsageWindowName(windowArg).slice(0, 128),
|
|
32
|
+
durationSeconds: windowArg.durationSeconds,
|
|
33
|
+
usedPercent: plugins.authswitchUsageWindows.authSwitchUsageWindowPercent(windowArg),
|
|
34
|
+
estimated: windowArg.estimatedUsedPercent !== null,
|
|
35
|
+
resetAt: windowArg.resetAt,
|
|
36
|
+
});
|
|
37
|
+
/**
|
|
38
|
+
* One member's projection. An account that takes work adds its headroom (`authSwitchHeadroomGrowth`) and grows as its
|
|
39
|
+
* windows reset. One that does not adds 0 until it takes work again -- a provider 429's rest ends (`cooling`), or the
|
|
40
|
+
* windows and provider refusal its limit is held by lift (`reserved`, `exhausted`: the limit's reset, never before the
|
|
41
|
+
* rest of a 429) -- and from then on what its windows leave it. One the proxy cannot judge (`unavailable`: a stale
|
|
42
|
+
* reading, a sign-in, model list or payment problem), or whose reading counts no window, adds 0 with no growth
|
|
43
|
+
* foreseen. A canceled account adds nothing from its lapse on.
|
|
44
|
+
*/
|
|
45
|
+
const projectMember = (accountArg, planArg, nowArg) => {
|
|
46
|
+
const { status, usage, quota } = accountArg;
|
|
47
|
+
const base = { accountId: status.id, plan: planArg, state: status.state };
|
|
48
|
+
const recheckAt = status.unavailable?.reason === 'usage_unread' ? status.unavailable.retryAt ?? null : null;
|
|
49
|
+
if (status.state === 'unavailable' || status.headroom === null || !usage?.reading) {
|
|
50
|
+
return { now: 0, steps: [], member: { ...base, headroom: 0, binding: null, growsAt: null, growsTo: null, recheckAt } };
|
|
51
|
+
}
|
|
52
|
+
const growth = plugins.authswitchUsageLimit.authSwitchHeadroomGrowth(usage.reading, status.maxUsagePercent, nowArg, status.reserveLiftUntil);
|
|
53
|
+
if (growth.headroom === null) {
|
|
54
|
+
return { now: 0, steps: [], member: { ...base, headroom: 0, binding: null, growsAt: null, growsTo: null, recheckAt } };
|
|
55
|
+
}
|
|
56
|
+
const windowsHeadroomAt = (atArg) => {
|
|
57
|
+
let headroom = growth.headroom;
|
|
58
|
+
for (const step of growth.steps) {
|
|
59
|
+
if (step.at > atArg)
|
|
60
|
+
break;
|
|
61
|
+
headroom = step.headroom;
|
|
62
|
+
}
|
|
63
|
+
return headroom;
|
|
64
|
+
};
|
|
65
|
+
// When it takes work again: now, a known moment ahead, or never as far as the reading says.
|
|
66
|
+
const statedReset = status.resetAt === null ? Number.NaN : Date.parse(status.resetAt);
|
|
67
|
+
const returns = status.state === 'available' ? -Infinity
|
|
68
|
+
: status.state === 'cooling' ? statedReset
|
|
69
|
+
: Math.max(statedReset, quota.restUntil);
|
|
70
|
+
const takesWorkFrom = status.state === 'available' ? -Infinity
|
|
71
|
+
: Number.isFinite(returns) && returns > nowArg ? returns : Infinity;
|
|
72
|
+
const lapses = status.lifecycle === 'canceled' && status.lapsesAt !== null ? Date.parse(status.lapsesAt) : Infinity;
|
|
73
|
+
const adds = (atArg) => atArg >= takesWorkFrom && atArg < lapses ? windowsHeadroomAt(atArg) : 0;
|
|
74
|
+
const moments = [...new Set([...growth.steps.map((stepArg) => stepArg.at), takesWorkFrom, lapses])]
|
|
75
|
+
.filter((atArg) => Number.isFinite(atArg) && atArg > nowArg)
|
|
76
|
+
.sort((left, right) => left - right);
|
|
77
|
+
const current = adds(nowArg);
|
|
78
|
+
const steps = [];
|
|
79
|
+
let previous = current;
|
|
80
|
+
for (const at of moments) {
|
|
81
|
+
const headroom = adds(at);
|
|
82
|
+
if (headroom !== previous)
|
|
83
|
+
steps.push({ at, headroom });
|
|
84
|
+
previous = headroom;
|
|
85
|
+
}
|
|
86
|
+
let before = current;
|
|
87
|
+
const grows = steps.find((stepArg) => {
|
|
88
|
+
const grew = stepArg.headroom > before;
|
|
89
|
+
before = stepArg.headroom;
|
|
90
|
+
return grew;
|
|
91
|
+
});
|
|
92
|
+
return { now: current, steps, member: { ...base, headroom: current,
|
|
93
|
+
binding: growth.binding ? capacityWindow(growth.binding) : null,
|
|
94
|
+
growsAt: grows ? iso(grows.at) : null, growsTo: grows ? grows.headroom : null, recheckAt } };
|
|
95
|
+
};
|
|
96
|
+
/**
|
|
97
|
+
* A pool's room for new work (AGL-1097). Its members are the pool's subscription sign-ins that have not lapsed and whose
|
|
98
|
+
* held reading states a plan the pool counts (`proxyCapacityPlans`), stale or not; API keys never count. The room is
|
|
99
|
+
* the headroom its members add now (see `projectMember`), summed.
|
|
100
|
+
*
|
|
101
|
+
* The pool is open when the room reaches `minHeadroom` and it is quiet: no provider 429 on a member within
|
|
102
|
+
* `proxyCapacityQuietMs`, which the proxy can say only once it has observed that long. Otherwise it waits until the
|
|
103
|
+
* first moment the members' readings foresee the room at the minimum once it is quiet (`room`), or until it is quiet when
|
|
104
|
+
* the room is there by then (`provider-429`, or `quiet-unobserved` while the proxy has not observed long enough); with
|
|
105
|
+
* no such moment foreseen, without an end (`until` and `seconds` `null`). Each projected moment is the earliest the room
|
|
106
|
+
* can be there, as no reading foresees the usage spent meanwhile.
|
|
107
|
+
*/
|
|
108
|
+
export const proxyPoolCapacity = (providerArg, accountsArg, optionsArg) => {
|
|
109
|
+
const { now, minHeadroom, observedSince } = optionsArg;
|
|
110
|
+
const counted = accountsArg.flatMap((accountArg) => {
|
|
111
|
+
const { status } = accountArg;
|
|
112
|
+
if (status.provider !== providerArg || status.credential !== 'subscription' || status.lifecycle === 'lapsed')
|
|
113
|
+
return [];
|
|
114
|
+
const plan = proxyCapacityHeldPlan(providerArg, accountArg.usage);
|
|
115
|
+
return plan !== null && proxyCapacityPlanCounts(providerArg, plan) ? [{ account: accountArg, plan }] : [];
|
|
116
|
+
}).sort((left, right) => left.account.status.id.localeCompare(right.account.status.id));
|
|
117
|
+
const projections = counted.map(({ account, plan }) => projectMember(account, plan, now));
|
|
118
|
+
const roomAt = (atArg) => projections.reduce((sumArg, projectionArg) => sumArg + headroomAt(projectionArg, atArg), 0);
|
|
119
|
+
const room = roomAt(now);
|
|
120
|
+
const lastQuota = counted.reduce((latestArg, { account }) => account.quota.lastAt === null ? latestArg
|
|
121
|
+
: Math.max(latestArg ?? -Infinity, account.quota.lastAt), null);
|
|
122
|
+
// When the pool is quiet, and why it is not before.
|
|
123
|
+
const quiet = [
|
|
124
|
+
...(lastQuota !== null ? [{ until: lastQuota + proxyCapacityQuietMs, reason: 'provider-429' }] : []),
|
|
125
|
+
{ until: observedSince + proxyCapacityQuietMs, reason: 'quiet-unobserved' },
|
|
126
|
+
].filter((entryArg) => entryArg.until > now).sort((left, right) => right.until - left.until);
|
|
127
|
+
const quietFrom = quiet[0]?.until ?? now;
|
|
128
|
+
let verdict;
|
|
129
|
+
if (!quiet.length && room >= minHeadroom)
|
|
130
|
+
verdict = { state: 'open' };
|
|
131
|
+
else {
|
|
132
|
+
const moments = [...new Set(projections.flatMap((projectionArg) => projectionArg.steps.map((stepArg) => stepArg.at)))]
|
|
133
|
+
.filter((atArg) => atArg > quietFrom).sort((left, right) => left - right);
|
|
134
|
+
const enough = roomAt(quietFrom) >= minHeadroom ? quietFrom : moments.find((atArg) => roomAt(atArg) >= minHeadroom);
|
|
135
|
+
verdict = enough === undefined ? { state: 'wait', reason: 'room', until: null, seconds: null }
|
|
136
|
+
: { state: 'wait', reason: enough > quietFrom || !quiet.length ? 'room' : quiet[0].reason, until: iso(enough),
|
|
137
|
+
seconds: Math.max(1, Math.ceil((enough - now) / 1000)) };
|
|
138
|
+
}
|
|
139
|
+
return { provider: providerArg, minHeadroom, room, members: projections.map((projectionArg) => projectionArg.member),
|
|
140
|
+
last429At: lastQuota === null ? null : iso(lastQuota), verdict };
|
|
141
|
+
};
|
|
142
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"functions.proxycapacity.js","sourceRoot":"","sources":["../../ts/functions.proxycapacity.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import type { IProxyCapacityAnswer, IProxyCapacityRequest } from '../dist_ts_interfaces/proxycapacity.js';
|
|
2
|
+
/** `agl proxy capacity` exits 0 when every pool it reports is open, 2 when one waits or `--wait` ran out; a failure exits 1. */
|
|
3
|
+
export declare const proxyCapacityExitOpen = 0;
|
|
4
|
+
export declare const proxyCapacityExitWait = 2;
|
|
5
|
+
/** The answer as `agl proxy capacity` prints it: per pool its verdict, room and newest 429, then each counted account. */
|
|
6
|
+
export declare const formatProxyCapacity: (answerArg: IProxyCapacityAnswer) => string;
|
|
7
|
+
export interface IProxyCapacityCliOptions {
|
|
8
|
+
request: IProxyCapacityRequest;
|
|
9
|
+
json: boolean;
|
|
10
|
+
/** Ask again until every pool asked is open; `--wait` names one pool. */
|
|
11
|
+
wait: boolean;
|
|
12
|
+
/** How long `--wait` waits at most; unbounded when absent. */
|
|
13
|
+
maxSeconds?: number;
|
|
14
|
+
}
|
|
15
|
+
/** What the command reads and writes, so a test runs it without a proxy or a clock. */
|
|
16
|
+
export interface IProxyCapacityCliIo {
|
|
17
|
+
ask: (requestArg: IProxyCapacityRequest, signalArg: AbortSignal) => Promise<IProxyCapacityAnswer>;
|
|
18
|
+
now: () => number;
|
|
19
|
+
sleep: (msArg: number, signalArg: AbortSignal) => Promise<void>;
|
|
20
|
+
/** Standard output: the answer. */
|
|
21
|
+
write: (textArg: string) => void;
|
|
22
|
+
/** Standard error: what `--wait` waits for between its questions. */
|
|
23
|
+
note: (textArg: string) => void;
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* `agl proxy capacity`: asks the proxy, prints its answer (text or `--json`) and resolves to the exit status. With
|
|
27
|
+
* `--wait` it asks again after the pool's `seconds`, at most a minute and never past `--max-seconds`, until the pool is
|
|
28
|
+
* open or that time ran out, and prints the last answer. A failure (no proxy, an older one, a refusal) rejects.
|
|
29
|
+
*/
|
|
30
|
+
export declare const runProxyCapacity: (optionsArg: IProxyCapacityCliOptions, ioArg: IProxyCapacityCliIo, signalArg: AbortSignal) => Promise<number>;
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { proxyCapacityPlans } from './functions.proxycapacity.js';
|
|
2
|
+
/** `agl proxy capacity` exits 0 when every pool it reports is open, 2 when one waits or `--wait` ran out; a failure exits 1. */
|
|
3
|
+
export const proxyCapacityExitOpen = 0;
|
|
4
|
+
export const proxyCapacityExitWait = 2;
|
|
5
|
+
/** How long `--wait` pauses at most before it asks again. */
|
|
6
|
+
const longestPauseMs = 60_000;
|
|
7
|
+
const poolNames = { anthropic: 'Claude', openai: 'ChatGPT' };
|
|
8
|
+
const waitReasons = {
|
|
9
|
+
room: 'too little room',
|
|
10
|
+
'provider-429': 'a provider 429 on a member within five minutes',
|
|
11
|
+
'quiet-unobserved': 'the proxy has watched its pools for provider 429s for less than five minutes',
|
|
12
|
+
};
|
|
13
|
+
const percent = (valueArg) => `${Math.round(valueArg * 10) / 10}%`;
|
|
14
|
+
/** The plans a pool counts, in words (`proxyCapacityPlans`). */
|
|
15
|
+
const countedPlans = (providerArg) => {
|
|
16
|
+
const rule = proxyCapacityPlans[providerArg];
|
|
17
|
+
return `${rule.counts === 'only' ? 'plan' : 'every plan but'} ${rule.plans.join(', ')}`;
|
|
18
|
+
};
|
|
19
|
+
const memberText = (memberArg) => {
|
|
20
|
+
const binding = memberArg.binding;
|
|
21
|
+
return ` account ${memberArg.accountId.slice(0, 12)} (${memberArg.plan}): ${memberArg.state}, adds ${percent(memberArg.headroom)}`
|
|
22
|
+
+ `${binding === null ? '' : `, bound by its ${binding.name} window (${percent(binding.usedPercent)} used`
|
|
23
|
+
+ `${binding.estimated ? ', est.' : ''}${binding.resetAt === null ? '' : `, resets ${binding.resetAt}`})`}`
|
|
24
|
+
+ `${memberArg.growsAt === null ? '; no growth foreseen' : `; grows at ${memberArg.growsAt} to ${percent(memberArg.growsTo)}`}`
|
|
25
|
+
+ `${memberArg.recheckAt === null ? '' : `; its usage is read again at ${memberArg.recheckAt}`}`;
|
|
26
|
+
};
|
|
27
|
+
const poolText = (poolArg, observedSinceArg) => {
|
|
28
|
+
const verdict = poolArg.verdict;
|
|
29
|
+
const verdictText = verdict.state === 'open' ? 'open'
|
|
30
|
+
: verdict.until === null ? `wait (${waitReasons[verdict.reason]}; no moment foreseen when it suffices)`
|
|
31
|
+
: `wait ${verdict.seconds} s, until ${verdict.until} (${waitReasons[verdict.reason]})`;
|
|
32
|
+
return [
|
|
33
|
+
`${poolNames[poolArg.provider]} pool (${poolArg.provider}): ${verdictText}; room ${percent(poolArg.room)}, `
|
|
34
|
+
+ `minimum ${poolArg.minHeadroom}%; last provider 429 on a member: ${poolArg.last429At ?? `none since ${observedSinceArg}`}`,
|
|
35
|
+
...poolArg.members.length ? poolArg.members.map(memberText)
|
|
36
|
+
: [` no account counts (${countedPlans(poolArg.provider)}, a subscription sign-in that has not lapsed)`],
|
|
37
|
+
];
|
|
38
|
+
};
|
|
39
|
+
/** The answer as `agl proxy capacity` prints it: per pool its verdict, room and newest 429, then each counted account. */
|
|
40
|
+
export const formatProxyCapacity = (answerArg) => [`As of ${answerArg.at}:`, ...answerArg.pools.flatMap((poolArg) => poolText(poolArg, answerArg.observedSince))].join('\n') + '\n';
|
|
41
|
+
/**
|
|
42
|
+
* `agl proxy capacity`: asks the proxy, prints its answer (text or `--json`) and resolves to the exit status. With
|
|
43
|
+
* `--wait` it asks again after the pool's `seconds`, at most a minute and never past `--max-seconds`, until the pool is
|
|
44
|
+
* open or that time ran out, and prints the last answer. A failure (no proxy, an older one, a refusal) rejects.
|
|
45
|
+
*/
|
|
46
|
+
export const runProxyCapacity = async (optionsArg, ioArg, signalArg) => {
|
|
47
|
+
const deadline = optionsArg.maxSeconds === undefined ? Infinity : ioArg.now() + optionsArg.maxSeconds * 1000;
|
|
48
|
+
for (;;) {
|
|
49
|
+
const answer = await ioArg.ask(optionsArg.request, signalArg);
|
|
50
|
+
const open = answer.pools.every((poolArg) => poolArg.verdict.state === 'open');
|
|
51
|
+
const remaining = deadline - ioArg.now();
|
|
52
|
+
if (!optionsArg.wait || open || remaining <= 0) {
|
|
53
|
+
ioArg.write(optionsArg.json ? JSON.stringify(answer) + '\n' : formatProxyCapacity(answer));
|
|
54
|
+
return open ? proxyCapacityExitOpen : proxyCapacityExitWait;
|
|
55
|
+
}
|
|
56
|
+
// `--wait` names one pool, which waits: the pause is its seconds, at most a minute and never past `--max-seconds`.
|
|
57
|
+
const [waiting] = answer.pools.flatMap((poolArg) => poolArg.verdict.state === 'wait'
|
|
58
|
+
? [{ provider: poolArg.provider, verdict: poolArg.verdict }] : []);
|
|
59
|
+
const pause = Math.min((waiting.verdict.seconds ?? 60) * 1000, longestPauseMs, remaining);
|
|
60
|
+
ioArg.note(`AGL proxy capacity: the ${poolNames[waiting.provider]} pool waits (${waitReasons[waiting.verdict.reason]}); `
|
|
61
|
+
+ `asking again in ${Math.ceil(pause / 1000)} s.\n`);
|
|
62
|
+
await ioArg.sleep(pause, signalArg);
|
|
63
|
+
}
|
|
64
|
+
};
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb25zLnByb3h5Y2FwYWNpdHljbGkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9mdW5jdGlvbnMucHJveHljYXBhY2l0eWNsaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFRQSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUVsRSxnSUFBZ0k7QUFDaEksTUFBTSxDQUFDLE1BQU0scUJBQXFCLEdBQUcsQ0FBQyxDQUFDO0FBQ3ZDLE1BQU0sQ0FBQyxNQUFNLHFCQUFxQixHQUFHLENBQUMsQ0FBQztBQUV2Qyw2REFBNkQ7QUFDN0QsTUFBTSxjQUFjLEdBQUcsTUFBTSxDQUFDO0FBRTlCLE1BQU0sU0FBUyxHQUEyQyxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxDQUFDO0FBRXJHLE1BQU0sV0FBVyxHQUE2QztJQUM1RCxJQUFJLEVBQUUsaUJBQWlCO0lBQ3ZCLGNBQWMsRUFBRSxnREFBZ0Q7SUFDaEUsa0JBQWtCLEVBQUUsOEVBQThFO0NBQ25HLENBQUM7QUFFRixNQUFNLE9BQU8sR0FBRyxDQUFDLFFBQWdCLEVBQVUsRUFBRSxDQUFDLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLEdBQUcsRUFBRSxDQUFDLEdBQUcsRUFBRSxHQUFHLENBQUM7QUFFbkYsZ0VBQWdFO0FBQ2hFLE1BQU0sWUFBWSxHQUFHLENBQUMsV0FBbUMsRUFBVSxFQUFFO0lBQ25FLE1BQU0sSUFBSSxHQUFHLGtCQUFrQixDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQzdDLE9BQU8sR0FBRyxJQUFJLENBQUMsTUFBTSxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxnQkFBZ0IsSUFBSSxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO0FBQzFGLENBQUMsQ0FBQztBQUVGLE1BQU0sVUFBVSxHQUFHLENBQUMs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
|
|
@@ -1,5 +1,9 @@
|
|
|
1
|
+
import type { SmartDataAuthStore } from './classes.authstore.js';
|
|
1
2
|
import { type ITpmSecretCodec } from './classes.tpmsecretcodec.js';
|
|
2
|
-
|
|
3
|
+
import type { IControllerIssuerIdentity } from './interfaces.identity.js';
|
|
4
|
+
import type { IControllerRuntimeConfig } from './interfaces.config.js';
|
|
5
|
+
import type { IRecordAuditEventDetails, TControllerAuditEventType } from './interfaces.auth.js';
|
|
6
|
+
export declare const remoteCliHelp = "Usage: agl remote set --public-origin ORIGIN [--rp-id HOST] [--gateway-source ADDRESS]... [--port PORT]\n agl remote unset [--port PORT]\n agl remote secret import [--port PORT] < SECRET_FILE\n agl remote gateway enrol|status|sync|remove [options] (agl remote gateway --help)\nEvery command runs against a stopped controller (agl stop first) on the port it was initialized on (default 4097),\nas the local OS user, and is audited.\nset moves the port to the HTTPS public origin ORIGIN behind a TLS reverse proxy, with WebAuthn RP ID HOST (default:\nthe origin's hostname). Each --gateway-source names an address the proxy reaches this host from; without one only a\nreverse proxy on this host reaches the controller, which then listens on loopback. The controller keeps its id and\nall of its data. When the origin or RP ID changes, its passkey is removed and every temporary password revoked: the\nnext start prints a new setup code, to enroll a passkey at the new origin. When the origin changes, every paired\ndevice is removed as well (a device signs the origin it paired with). Run it again to change the gateway sources;\nthe passkey and the devices then stay. While the controller is enrolled with a gateway, set keeps the origin's\nhostname: for another, run agl remote gateway remove, then agl remote set, then agl remote gateway enrol.\nunset moves the port back to http://localhost:PORT (RP ID localhost), removes the passkey and every paired device,\nrevokes every temporary password and forgets the trusted-proxy secret. It is refused while the controller is enrolled\nwith a gateway: run agl remote gateway remove first.\nsecret import reads a 32-byte base64url secret (43 characters) from standard input, never from a terminal, and makes\nit the controller's trusted-proxy secret, for a reverse proxy other than AGL's own gateway: that proxy injects it as\nX-Harness-Controller-Proxy-Secret. The secret is sealed with the TPM and never printed.\n";
|
|
3
7
|
export type TRemoteCliArguments = {
|
|
4
8
|
action: 'set';
|
|
5
9
|
port: number;
|
|
@@ -15,13 +19,36 @@ export type TRemoteCliArguments = {
|
|
|
15
19
|
};
|
|
16
20
|
export declare const parseRemoteCliArguments: (argsArg: readonly string[]) => TRemoteCliArguments;
|
|
17
21
|
export interface IRemoteCliOptions {
|
|
18
|
-
/** Seals the trusted-proxy secret; TPM2 when absent. For tests. */
|
|
22
|
+
/** Seals the trusted-proxy secret and the gateway credential; TPM2 when absent. For tests. */
|
|
19
23
|
codec?: ITpmSecretCodec;
|
|
20
|
-
/** Where `secret import`
|
|
24
|
+
/** Where `secret import` and `gateway enrol` read their secret; this process's standard input when absent. */
|
|
21
25
|
input?: NodeJS.ReadableStream & {
|
|
22
26
|
isTTY?: boolean;
|
|
23
27
|
};
|
|
24
28
|
/** Where the outcome is written; standard output when absent. */
|
|
25
29
|
write?: (textArg: string) => void;
|
|
30
|
+
/** Waits before each retried gateway confirmation of `gateway enrol`; 1 s and 3 s when absent. For tests. */
|
|
31
|
+
finalizeRetryDelaysMs?: readonly number[];
|
|
26
32
|
}
|
|
33
|
+
/**
|
|
34
|
+
* Reads a secret from standard input, a pipe or a file, never a terminal (`refusalArg` names the right way), and
|
|
35
|
+
* returns it trimmed; nothing of it is echoed or kept past the read.
|
|
36
|
+
*/
|
|
37
|
+
export declare const readStandardInputSecret: (inputArg: NodeJS.ReadableStream & {
|
|
38
|
+
isTTY?: boolean;
|
|
39
|
+
}, refusalArg: string, whatArg: string) => Promise<string>;
|
|
40
|
+
export interface IStoppedController {
|
|
41
|
+
authStore: SmartDataAuthStore;
|
|
42
|
+
issuer: IControllerIssuerIdentity;
|
|
43
|
+
/** `controller:<port>`. */
|
|
44
|
+
controllerId: string;
|
|
45
|
+
config: IControllerRuntimeConfig;
|
|
46
|
+
}
|
|
47
|
+
/** Runs `actionArg` on the stored configuration of a stopped, initialized controller, under start admission. */
|
|
48
|
+
export declare const withStoppedController: <T>(portArg: number, actionArg: (controllerArg: IStoppedController) => Promise<T>) => Promise<T>;
|
|
49
|
+
/**
|
|
50
|
+
* Records `typeArg` as attempted, runs the change, and records its outcome, attributed to this OS user and process;
|
|
51
|
+
* every event records `detailsArg` (a move where it goes from and to, a gateway command its route).
|
|
52
|
+
*/
|
|
53
|
+
export declare const audited: <T>(authStoreArg: SmartDataAuthStore, typeArg: TControllerAuditEventType, actionArg: () => Promise<T>, detailsArg?: IRecordAuditEventDetails) => Promise<T>;
|
|
27
54
|
export declare const runRemoteCli: (argsArg: string[], optionsArg?: IRemoteCliOptions) => Promise<void>;
|