agl 43.1.0 → 43.3.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 +32 -0
- package/dist_serve/bundle.js +5950 -5530
- package/dist_serve/bundle.js.map +2 -2
- package/dist_serve/bundle.js.third-party-notices.json +31 -31
- package/dist_serve/bundle.js.third-party-notices.txt +31 -31
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/aglapi/aglapisurface.document.js +521 -17
- package/dist_ts/aglapi/interfaces.d.ts +3 -0
- package/dist_ts/aglapi/interfaces.js +2 -1
- package/dist_ts/classes.accountsactions.d.ts +3 -1
- package/dist_ts/classes.accountsactions.js +21 -3
- package/dist_ts/classes.authmodels.js +17 -4
- package/dist_ts/classes.authstore.js +16 -2
- package/dist_ts/classes.claudeharness.d.ts +16 -0
- package/dist_ts/classes.claudeharness.js +24 -2
- package/dist_ts/classes.cli.d.ts +4 -2
- package/dist_ts/classes.cli.js +6 -3
- package/dist_ts/classes.codexclientadapter.d.ts +11 -0
- package/dist_ts/classes.codexclientadapter.js +14 -2
- package/dist_ts/classes.controller.d.ts +175 -11
- package/dist_ts/classes.controller.js +1213 -173
- package/dist_ts/classes.controllerdevices.d.ts +2 -0
- package/dist_ts/classes.controllerdevices.js +6 -1
- 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.inbox.d.ts +72 -0
- package/dist_ts/classes.inbox.js +231 -0
- package/dist_ts/classes.inferencerouter.d.ts +19 -0
- package/dist_ts/classes.inferencerouter.js +15 -3
- package/dist_ts/classes.inferenceservice.d.ts +9 -0
- package/dist_ts/classes.inferenceservice.js +28 -2
- package/dist_ts/classes.mcpclient.d.ts +4 -1
- package/dist_ts/classes.mcpclient.js +42 -6
- package/dist_ts/classes.mcpcontrollerhost.d.ts +3 -1
- package/dist_ts/classes.mcpcontrollerhost.js +11 -1
- package/dist_ts/classes.mcptools.d.ts +3 -3
- package/dist_ts/classes.mcptools.js +38 -8
- package/dist_ts/classes.mcpvalidation.d.ts +5 -0
- package/dist_ts/classes.mcpvalidation.js +38 -2
- package/dist_ts/classes.nativesessions.d.ts +17 -4
- package/dist_ts/classes.nativesessions.js +41 -9
- package/dist_ts/classes.opencodeclient.d.ts +23 -2
- package/dist_ts/classes.opencodeclient.js +47 -3
- 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.publishedset.d.ts +38 -0
- package/dist_ts/classes.publishedset.js +50 -0
- package/dist_ts/classes.sessionfeed.d.ts +3 -3
- package/dist_ts/classes.sessionfeed.js +18 -26
- package/dist_ts/classes.systemmetricssampler.d.ts +6 -0
- package/dist_ts/classes.systemmetricssampler.js +15 -3
- package/dist_ts/classes.ticketstore.d.ts +50 -3
- package/dist_ts/classes.ticketstore.js +45 -8
- package/dist_ts/classes.trustedproxysecrets.d.ts +2 -0
- package/dist_ts/classes.trustedproxysecrets.js +5 -1
- package/dist_ts/driver/classes.directreports.d.ts +14 -4
- package/dist_ts/driver/classes.directreports.js +25 -6
- package/dist_ts/driver/classes.driverservice.d.ts +44 -3
- package/dist_ts/driver/classes.driverservice.js +50 -16
- package/dist_ts/fleet/classes.claudeworkers.d.ts +21 -5
- package/dist_ts/fleet/classes.claudeworkers.js +142 -46
- package/dist_ts/fleet/classes.codexworkers.d.ts +16 -4
- package/dist_ts/fleet/classes.codexworkers.js +22 -5
- package/dist_ts/fleet/classes.workercommand.d.ts +6 -1
- package/dist_ts/fleet/classes.workercommand.js +15 -4
- package/dist_ts/fleet/classes.workers.d.ts +5 -1
- package/dist_ts/fleet/classes.workers.js +8 -2
- package/dist_ts/fleet/functions.unbounddrivers.js +2 -2
- package/dist_ts/fleet/functions.workervalidation.js +2 -2
- package/dist_ts/fleet/interfaces.workers.d.ts +21 -3
- package/dist_ts/fleet/interfaces.workers.js +1 -1
- package/dist_ts/functions.agentmessage.d.ts +3 -0
- package/dist_ts/functions.agentmessage.js +4 -1
- package/dist_ts/functions.controllermanagementsurface.d.ts +4 -0
- package/dist_ts/functions.controllermanagementsurface.js +15 -1
- package/dist_ts/functions.deviceapi.d.ts +151 -4
- package/dist_ts/functions.deviceapi.js +893 -38
- package/dist_ts/functions.fleetworkercli.d.ts +1 -1
- package/dist_ts/functions.fleetworkercli.js +11 -8
- 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 +32 -1
- package/dist_ts/functions.inferencecliarguments.d.ts +8 -2
- package/dist_ts/functions.inferencecliarguments.js +31 -3
- package/dist_ts/functions.mcpfleetworkertools.js +2 -2
- 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/functions.ticketvalidation.js +11 -2
- package/dist_ts/interfaces.auth.d.ts +25 -4
- package/dist_ts/interfaces.auth.js +15 -1
- package/dist_ts/plugins.d.ts +5 -1
- package/dist_ts/plugins.js +10 -2
- package/dist_ts_authswitch/authority-contract.d.ts +25 -0
- package/dist_ts_authswitch/authority-contract.js +1 -1
- package/dist_ts_authswitch/authority-overview.d.ts +8 -0
- package/dist_ts_authswitch/authority-overview.js +17 -6
- package/dist_ts_authswitch/authority-placement.d.ts +20 -16
- package/dist_ts_authswitch/authority-placement.js +19 -26
- package/dist_ts_authswitch/authority-renewal.d.ts +34 -0
- package/dist_ts_authswitch/authority-renewal.js +56 -0
- 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_authswitch/classes.authoritybroker.d.ts +8 -0
- package/dist_ts_authswitch/classes.authoritybroker.js +35 -2
- package/dist_ts_authswitch/classes.authoritycli.d.ts +1 -0
- package/dist_ts_authswitch/classes.authoritycli.js +44 -3
- package/dist_ts_authswitch/classes.authorityclient.d.ts +6 -1
- package/dist_ts_authswitch/classes.authorityclient.js +12 -4
- package/dist_ts_authswitch/classes.authoritydaemon.js +8 -1
- package/dist_ts_authswitch/classes.authoritydatabase.js +6 -2
- package/dist_ts_authswitch/classes.authoritymodels.d.ts +7 -0
- package/dist_ts_authswitch/classes.authoritymodels.js +21 -5
- package/dist_ts_interfaces/devices.d.ts +1012 -5
- package/dist_ts_interfaces/devices.js +68 -2
- package/dist_ts_interfaces/fleetworkers.d.ts +5 -3
- package/dist_ts_interfaces/gateway.d.ts +151 -0
- package/dist_ts_interfaces/gateway.js +66 -0
- package/dist_ts_interfaces/inbox.d.ts +234 -0
- package/dist_ts_interfaces/inbox.js +101 -0
- package/dist_ts_interfaces/index.d.ts +3 -0
- package/dist_ts_interfaces/index.js +4 -1
- package/dist_ts_interfaces/interfaces.d.ts +10 -3
- package/dist_ts_interfaces/interfaces.js +4 -2
- package/dist_ts_interfaces/management.d.ts +4 -4
- package/dist_ts_interfaces/management.js +3 -2
- package/dist_ts_interfaces/mcprequests.d.ts +48 -6
- package/dist_ts_interfaces/mcprequests.js +12 -1
- package/dist_ts_interfaces/mcpworkspacerequests.d.ts +4 -1
- package/dist_ts_interfaces/mcpworkspacerequests.js +1 -1
- package/dist_ts_interfaces/nativesessions.d.ts +16 -3
- package/dist_ts_interfaces/plugins.d.ts +2 -1
- package/dist_ts_interfaces/plugins.js +4 -2
- package/dist_ts_interfaces/proxycapacity.d.ts +99 -0
- package/dist_ts_interfaces/proxycapacity.js +74 -0
- package/dist_ts_interfaces/requests.accounts.d.ts +21 -0
- package/dist_ts_interfaces/requests.accounts.js +3 -1
- package/dist_ts_interfaces/requests.d.ts +3 -2
- package/dist_ts_interfaces/requests.js +1 -1
- package/docs/authswitch.md +20 -1
- package/package.json +6 -5
- package/readme.md +191 -31
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/aglapi/aglapisurface.document.ts +520 -16
- package/ts/aglapi/interfaces.ts +1 -0
- package/ts/classes.accountsactions.ts +30 -3
- package/ts/classes.authmodels.ts +22 -3
- package/ts/classes.authstore.ts +15 -1
- package/ts/classes.claudeharness.ts +27 -1
- package/ts/classes.cli.ts +7 -3
- package/ts/classes.codexclientadapter.ts +14 -1
- package/ts/classes.controller.ts +1428 -249
- package/ts/classes.controllerdevices.ts +6 -0
- package/ts/classes.controllermanagement.ts +40 -7
- package/ts/classes.gatewayclient.ts +401 -0
- package/ts/classes.gatewayclientstore.ts +272 -0
- package/ts/classes.inbox.ts +239 -0
- package/ts/classes.inferencerouter.ts +27 -2
- package/ts/classes.inferenceservice.ts +28 -1
- package/ts/classes.mcpclient.ts +42 -3
- package/ts/classes.mcpcontrollerhost.ts +15 -0
- package/ts/classes.mcptools.ts +42 -9
- package/ts/classes.mcpvalidation.ts +32 -1
- package/ts/classes.nativesessions.ts +50 -12
- package/ts/classes.opencodeclient.ts +55 -4
- 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.publishedset.ts +56 -0
- package/ts/classes.sessionfeed.ts +17 -20
- package/ts/classes.systemmetricssampler.ts +13 -2
- package/ts/classes.ticketstore.ts +73 -12
- package/ts/classes.trustedproxysecrets.ts +5 -0
- package/ts/driver/classes.directreports.ts +25 -6
- package/ts/driver/classes.driverservice.ts +75 -14
- package/ts/fleet/classes.claudeworkers.ts +112 -39
- package/ts/fleet/classes.codexworkers.ts +21 -6
- package/ts/fleet/classes.workercommand.ts +14 -4
- package/ts/fleet/classes.workers.ts +9 -2
- package/ts/fleet/functions.unbounddrivers.ts +1 -1
- package/ts/fleet/functions.workervalidation.ts +1 -1
- package/ts/fleet/interfaces.workers.ts +20 -5
- package/ts/functions.agentmessage.ts +3 -0
- package/ts/functions.controllermanagementsurface.ts +15 -0
- package/ts/functions.deviceapi.ts +1071 -34
- package/ts/functions.fleetworkercli.ts +10 -7
- package/ts/functions.gatewaycli.ts +436 -0
- package/ts/functions.gatewayroute.ts +429 -0
- package/ts/functions.inferencecli.ts +26 -0
- package/ts/functions.inferencecliarguments.ts +30 -4
- package/ts/functions.mcpfleetworkertools.ts +1 -1
- package/ts/functions.proxycapacity.ts +191 -0
- package/ts/functions.proxycapacitycli.ts +104 -0
- package/ts/functions.remotecli.ts +56 -20
- package/ts/functions.ticketvalidation.ts +11 -1
- package/ts/interfaces.auth.ts +36 -4
- package/ts/plugins.ts +12 -0
- package/ts_authswitch/authority-contract.ts +20 -0
- package/ts_authswitch/authority-overview.ts +28 -6
- package/ts_authswitch/authority-placement.ts +27 -32
- package/ts_authswitch/authority-renewal.ts +64 -0
- package/ts_authswitch/authority-usagelimit.ts +84 -1
- package/ts_authswitch/authority-usagewindows.ts +13 -0
- package/ts_authswitch/classes.authoritybroker.ts +34 -1
- package/ts_authswitch/classes.authoritycli.ts +49 -2
- package/ts_authswitch/classes.authorityclient.ts +14 -4
- package/ts_authswitch/classes.authoritydaemon.ts +9 -1
- package/ts_authswitch/classes.authoritydatabase.ts +5 -1
- package/ts_authswitch/classes.authoritymodels.ts +23 -3
- package/ts_authswitch/native-contracts.md +21 -0
- package/ts_authswitch/readme.md +1 -1
- package/ts_interfaces/devices.schema.json +3573 -603
- package/ts_interfaces/devices.ts +1093 -4
- package/ts_interfaces/fleetworkers.ts +5 -3
- package/ts_interfaces/gateway.ts +242 -0
- package/ts_interfaces/inbox.ts +287 -0
- package/ts_interfaces/index.ts +3 -0
- package/ts_interfaces/interfaces.ts +9 -2
- package/ts_interfaces/management.ts +6 -4
- package/ts_interfaces/mcprequests.ts +61 -4
- package/ts_interfaces/mcpworkspacerequests.ts +4 -2
- package/ts_interfaces/nativesessions.ts +17 -3
- package/ts_interfaces/plugins.ts +3 -1
- package/ts_interfaces/proxycapacity.ts +162 -0
- package/ts_interfaces/requests.accounts.ts +20 -0
- package/ts_interfaces/requests.ts +4 -0
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/accounts.plugins.ts +4 -2
- package/ts_web/classes.accountsreadmodel.ts +33 -0
- package/ts_web/classes.browserpresentation.ts +19 -6
- package/ts_web/classes.inboxfeed.ts +329 -0
- package/ts_web/classes.nativesessionstate.ts +9 -23
- package/ts_web/elements.accounts.ts +121 -113
- package/ts_web/elements.configurationpane.ts +24 -37
- package/ts_web/elements.deployments.ts +66 -2
- package/ts_web/elements.devices.ts +4 -17
- package/ts_web/elements.flexlimitstrip.ts +21 -70
- package/ts_web/elements.harnesscontrollerapp.ts +198 -222
- package/ts_web/elements.inbox.ts +808 -0
- package/ts_web/functions.inbox.ts +95 -0
- package/ts_web/functions.sessioncards.ts +40 -0
- package/ts_web/plugins.ts +2 -0
|
@@ -196,6 +196,14 @@ export interface IAuthSwitchAccount {
|
|
|
196
196
|
* request. Clearing the date makes it active again. See `authority-placement.ts`.
|
|
197
197
|
*/
|
|
198
198
|
lapsesAt: string | null;
|
|
199
|
+
/**
|
|
200
|
+
* The anchor of a Claude sign-in's monthly renewal, as its owner set it (ISO 8601 UTC, `isAuthSwitchRenewsAt` of
|
|
201
|
+
* `authority-renewal.ts`); `null` when none is set, and always for any other account. Every renewal is a calendar
|
|
202
|
+
* month from the anchor (`authSwitchNextRenewal`); nothing derives it from a provider. Placement spends a window's
|
|
203
|
+
* usage by the next renewal when that comes before the window resets; it changes no lifecycle, and an account with a
|
|
204
|
+
* lapse date ignores it. Whether the windows reset at a renewal is not known. See `authority-placement.ts`.
|
|
205
|
+
*/
|
|
206
|
+
renewsAt: string | null;
|
|
199
207
|
/**
|
|
200
208
|
* An API key account's spend limit per calendar month in UTC, in micro-dollars (`isAuthSwitchSpendLimitMicroUsd`);
|
|
201
209
|
* `null` for none, and always for an account on a sign-in. The limit counts what AGL's inference proxy relayed on the
|
|
@@ -1598,6 +1606,23 @@ export interface IReq_AuthSwitchSetAccountLapse extends ITypedRequest {
|
|
|
1598
1606
|
account: IAuthSwitchAccount;
|
|
1599
1607
|
};
|
|
1600
1608
|
}
|
|
1609
|
+
/**
|
|
1610
|
+
* Sets the anchor of a Claude sign-in's monthly renewal (`renewsAt`, see `isAuthSwitchRenewsAt`), or clears it with
|
|
1611
|
+
* `null`. A past anchor is valid: the next renewal is a whole number of months after it. `expectedRevision` is the
|
|
1612
|
+
* revision the caller read, so a change of an account that changed meanwhile is refused as `account_changed`; a value
|
|
1613
|
+
* that breaks the rule, or any account other than a Claude sign-in, is refused as `invalid_input`.
|
|
1614
|
+
*/
|
|
1615
|
+
export interface IReq_AuthSwitchSetAccountRenewal extends ITypedRequest {
|
|
1616
|
+
method: 'authswitch.authority.renewal';
|
|
1617
|
+
request: {
|
|
1618
|
+
accountId: string;
|
|
1619
|
+
expectedRevision: number;
|
|
1620
|
+
renewsAt: string | null;
|
|
1621
|
+
};
|
|
1622
|
+
response: {
|
|
1623
|
+
account: IAuthSwitchAccount;
|
|
1624
|
+
};
|
|
1625
|
+
}
|
|
1601
1626
|
/**
|
|
1602
1627
|
* One binding by the id `bind` returned, credential-free, or `null` when this authority holds no binding by
|
|
1603
1628
|
* that id. A backend checks that its binding still stands without reading the whole snapshot.
|
|
@@ -152,4 +152,4 @@ export const isAuthSwitchSpendAnswerBatch = (value) => Array.isArray(value)
|
|
|
152
152
|
&& value.length >= 1 && value.length <= authSwitchSpendAnswerBatchLimit && value.every(isAuthSwitchSpendAnswer)
|
|
153
153
|
&& new Set(value.map((answer) => answer.answerId)).size === value.length;
|
|
154
154
|
/** Runtime capability is returned only to trusted backend callers; do not expose this response in a browser API. */
|
|
155
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
155
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"authority-contract.js","sourceRoot":"","sources":["../../ts_authswitch/authority-contract.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAsFjE,6FAA6F;AAC7F,MAAM,CAAC,MAAM,6BAA6B,GAAG,2BAA2B,CAAC;AACzE,MAAM,CAAC,MAAM,uBAAuB,GAAG,oBAAoB,CAAC;AAiB5D,MAAM,YAAY,GAAwB,IAAI,GAAG,CAAyB;IACxE,mBAAmB,EAAE,WAAW,EAAE,iBAAiB,EAAE,cAAc;IACnE,mBAAmB,EAAE,sBAAsB,EAAE,0BAA0B,EAAE,0BAA0B;IACnG,wBAAwB,EAAE,wBAAwB,EAAE,gBAAgB;IACpE,mBAAmB,EAAE,eAAe;IACpC,oBAAoB,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,qBAAqB;IAC/G,sBAAsB,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,uBAAuB;IACjG,8BAA8B,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,oBAAoB;IAC3J,wBAAwB,EAAE,oBAAoB;CAC/C,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,CAAC,KAAc,EAAmC,EAAE,CACxE,OAAO,KAAK,KAAK,QAAQ,IAAI,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAEvD,+FAA+F;AAC/F,MAAM,QAAQ,GAAG,CAAC,IAA4B,EAA4B,EAAE,CAC1E,IAAI,KAAK,gBAAgB,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,uBAAuB,CAAC;AAEtF;;;;;GAKG;AACH,MAAM,OAAO,iBAAkB,SAAQ,KAAK;IAC1B,IAAI,CAAyB;IAE7C,YAAY,IAA4B,EAAE,WAAmB;QAC3D,KAAK,CAAC,WAAW,CAAC,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,mEAAmE;IACnE,IAAW,IAAI,KAA6B,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;CACvG;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,KAAc,EAA6B,EAAE;IAC/E,IAAI,KAAK,YAAY,iBAAiB;QAAE,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;IAChG,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,CAAC,WAAW,IAAI,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACxF,MAAM,IAAI,GAAY,KAAK,CAAC,SAAS,CAAC;IACtC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,QAAQ,IAAI,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAClF,MAAM,IAAI,GAAY,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7D,MAAM,WAAW,GAAG,SAAS,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IACjG,IAAI,IAAI,CAAC,MAAM,KAAK,6BAA6B,EAAE,CAAC;QAClD,OAAO,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,gBAAgB,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1G,CAAC;IACD,IAAI,IAAI,CAAC,MAAM,KAAK,uBAAuB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACjF,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;AAC/B,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,8BAA8B,GAAG,uCAAuC,CAAC;AAEtF;;;GAGG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,KAAc,EAAW,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;OAC/G,WAAW,IAAI,KAAK,IAAI,KAAK,CAAC,SAAS,KAAK,8BAA8B,IAAI,mBAAmB,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC;AAEvH,uDAAuD;AACvD,MAAM,CAAC,MAAM,+BAA+B,GAAG,GAAG,CAAC;AAEnD;;;;GAIG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,KAAc,EAAmB,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ;OACjG,KAAK,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,IAAI,+BAA+B;OAC7F,CAAC,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAE1C,+HAA+H;AAC/H,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAU,EAAE,CAAC,SAAS,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAEzF,yGAAyG;AACzG,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,KAAc,EAAmB,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ;OAC5F,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAE1C,gGAAgG;AAChG,MAAM,CAAC,MAAM,uBAAuB,GAA2C,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;AAEnH,+FAA+F;AAC/F,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,KAAc,EAAmB,EAAE,CAC9E,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;AAEpF;;;;GAIG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,KAAc,EAAmB,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC;OACrG,KAAgB,IAAI,uBAAuB,CAAC,GAAG,IAAK,KAAgB,IAAI,uBAAuB,CAAC,GAAG,CAAC;AAE1G;;;;;GAKG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,KAAc,EAAmB,EAAE;IACtE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,EAAE;QAAE,OAAO,KAAK,CAAC;IACjE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC7B,OAAO,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AACzF,CAAC,CAAC;AAyIF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAA6C,CAAC,SAAS,CAAC,CAAC;AAqZnG,0FAA0F;AAC1F,MAAM,CAAC,MAAM,+BAA+B,GAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAepF;;;GAGG;AACH,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAAC,OAAiD,EAAU,EAAE,CAC7G,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,MAAM,CAAC,GAAG,IAAI,SAAS,GAAG,MAAM,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,MAAM,CAAC,SAAS,GAAG,GAAG;MACvH,CAAC,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAsfxG,uFAAuF;AACvF,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,KAAc,EAA2C,EAAE,CACzG,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,WAAW,IAAI,KAAK,KAAK,OAAO,CAAC;AAyBpE,iDAAiD;AACjD,MAAM,CAAC,MAAM,+BAA+B,GAAG,EAAE,CAAC;AAElD,8GAA8G;AAC9G,MAAM,CAAC,MAAM,gCAAgC,GAAG,cAAc,CAAC;AAE/D,MAAM,eAAe,GACnB,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;AAE7E,oHAAoH;AACpH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,KAAc,EAAmC,EAAE;IACzF,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACtF,MAAM,MAAM,GAAG,KAAgC,CAAC;IAChD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,eAAe,CAAC,MAAM,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;WACrH,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ;WACnC,gEAAgE,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;WACtF,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;WACjF,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,OAAO;WACzD,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC;WACjC,CAAC,MAAM,CAAC,WAAW,KAAK,IAAI,IAAI,CAAC,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ;eACrE,yBAAyB,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;WACtD,CAAC,MAAM,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,KAAK,IAAI;YACxD,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAK,MAAM,CAAC,QAAmB,IAAI,CAAC;mBACrE,MAAM,CAAC,QAAmB,IAAI,gCAAgC;mBAC/D,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ,IAAI,iDAAiD,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;AACjI,CAAC,CAAC;AAEF,yHAAyH;AACzH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,KAAc,EAAqC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;OAClH,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,KAAK,CAAC,MAAM,IAAI,+BAA+B,IAAI,KAAK,CAAC,KAAK,CAAC,uBAAuB,CAAC;OAC5G,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAA8B,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,MAAM,CAAC;AAwNnG,oHAAoH"}
|
|
@@ -7,6 +7,7 @@ import { type IAuthSwitchBinding, type IAuthSwitchLogin, type IAuthSwitchNativeA
|
|
|
7
7
|
import { type IAuthSwitchUsageWindow } from './authority-usagewindows.js';
|
|
8
8
|
import { type IAuthSwitchUsageLimit, type TAuthSwitchLimitState } from './authority-usagelimit.js';
|
|
9
9
|
import { type IAuthSwitchPlacement, type TAuthSwitchAccountLifecycle } from './authority-placement.js';
|
|
10
|
+
import { type IAuthSwitchRenewal } from './authority-renewal.js';
|
|
10
11
|
import { type IAuthSwitchSubscriptionFact } from './authority-subscription.js';
|
|
11
12
|
import type { IAuthSwitchPaymentProblem } from './classes.authorityusage.js';
|
|
12
13
|
/** Where a tool runs on an account: a tool's own home the service switches, or a runtime AGL bound to it. */
|
|
@@ -52,6 +53,11 @@ export interface IAuthSwitchAccountOverview {
|
|
|
52
53
|
/** When the account's subscription ends, or null while it renews (`IAuthSwitchAccount.lapsesAt`). */
|
|
53
54
|
lapsesAt: string | null;
|
|
54
55
|
lifecycle: TAuthSwitchAccountLifecycle;
|
|
56
|
+
/**
|
|
57
|
+
* The account's next monthly renewal as its owner set it (`IAuthSwitchAccount.renewsAt` rolled forward), or null
|
|
58
|
+
* without one. Placement ignores it while the account has a lapse date.
|
|
59
|
+
*/
|
|
60
|
+
renewal: IAuthSwitchRenewal | null;
|
|
55
61
|
/**
|
|
56
62
|
* How the AGL proxy treats the account for a new session, by the rule of `authority-placement.ts`: its score in
|
|
57
63
|
* percent per hour (null without a counted window) and whether it is a last resort or never placed on.
|
|
@@ -90,6 +96,8 @@ export interface IAuthSwitchLimitRow {
|
|
|
90
96
|
/** When the account's subscription ends, or null while it renews. */
|
|
91
97
|
lapsesAt: string | null;
|
|
92
98
|
lifecycle: TAuthSwitchAccountLifecycle;
|
|
99
|
+
/** The account's next monthly renewal as its owner set it, or null without one (`IAuthSwitchAccountOverview.renewal`). */
|
|
100
|
+
renewal: IAuthSwitchRenewal | null;
|
|
93
101
|
/** The account's placement score in percent per hour (`IAuthSwitchPlacement.score`), on each of its rows. */
|
|
94
102
|
placementScore: number | null;
|
|
95
103
|
placementEligibility: IAuthSwitchPlacement['eligibility'];
|
|
@@ -7,6 +7,7 @@ import { asAuthSwitchRefusal } from './authority-contract.js';
|
|
|
7
7
|
import { authSwitchUsageProblemText, authSwitchUsageWindowName, authSwitchUsageWindowPercent, authSwitchUsageWindows } from './authority-usagewindows.js';
|
|
8
8
|
import { authSwitchUsageLimit, authSwitchUsageLimitText } from './authority-usagelimit.js';
|
|
9
9
|
import { authSwitchPlacement } from './authority-placement.js';
|
|
10
|
+
import { authSwitchRenewal } from './authority-renewal.js';
|
|
10
11
|
import { authSwitchSubscriptionFacts } from './authority-subscription.js';
|
|
11
12
|
import { plainText } from './formatting.js';
|
|
12
13
|
import { authSwitchUsdText } from './authority-spend.js';
|
|
@@ -63,9 +64,10 @@ export const readAuthSwitchAccountOverview = async (snapshotArg, getUsageArg, no
|
|
|
63
64
|
plan: accountArg.plan, usedBy: accountUses(snapshotArg, accountArg.id), usageLoginId: login?.id ?? null,
|
|
64
65
|
loginHealth: login?.health ?? null, loginProblem: login?.problem ?? null,
|
|
65
66
|
maxUsagePercent: accountArg.maxUsagePercent, lapsesAt: accountArg.lapsesAt,
|
|
66
|
-
lifecycle: authSwitchPlacement(null, accountArg.maxUsagePercent, accountArg.lapsesAt, nowArg, accountArg.reserveLiftUntil).lifecycle,
|
|
67
|
+
lifecycle: authSwitchPlacement(null, accountArg.maxUsagePercent, accountArg.lapsesAt, accountArg.renewsAt, nowArg, accountArg.reserveLiftUntil).lifecycle,
|
|
68
|
+
renewal: authSwitchRenewal(accountArg.renewsAt, nowArg),
|
|
67
69
|
};
|
|
68
|
-
const placement = (readingArg) => authSwitchPlacement(readingArg, accountArg.maxUsagePercent, accountArg.lapsesAt, nowArg, accountArg.reserveLiftUntil);
|
|
70
|
+
const placement = (readingArg) => authSwitchPlacement(readingArg, accountArg.maxUsagePercent, accountArg.lapsesAt, accountArg.renewsAt, nowArg, accountArg.reserveLiftUntil);
|
|
69
71
|
if (login === null) {
|
|
70
72
|
return { ...base, usage: null, windows: [], problem: 'The account has no login to read its usage with.',
|
|
71
73
|
subscription: [], paymentProblem: null, limit: null, placement: placement(null) };
|
|
@@ -112,7 +114,8 @@ export const authSwitchLimitList = (overviewArg) => ({
|
|
|
112
114
|
const base = { accountId: accountArg.accountId, providerId: accountArg.providerId, account: identity(accountArg),
|
|
113
115
|
plan: accountArg.plan, usageState: accountArg.usage?.state ?? null, problem: accountArg.problem,
|
|
114
116
|
maxUsagePercent: accountArg.maxUsagePercent, accountState: accountArg.limit?.state ?? null,
|
|
115
|
-
lapsesAt: accountArg.lapsesAt, lifecycle: accountArg.lifecycle,
|
|
117
|
+
lapsesAt: accountArg.lapsesAt, lifecycle: accountArg.lifecycle, renewal: accountArg.renewal,
|
|
118
|
+
placementScore: accountArg.placement.score,
|
|
116
119
|
placementEligibility: accountArg.placement.eligibility };
|
|
117
120
|
if (accountArg.windows.length === 0) {
|
|
118
121
|
return [{ ...base, limit: null, windowSeconds: null, usedPercent: null, estimatedUsedPercent: null, resetAt: null,
|
|
@@ -182,16 +185,24 @@ const limitLines = (maxUsagePercentArg, limitArg, nowArg) => [
|
|
|
182
185
|
];
|
|
183
186
|
/**
|
|
184
187
|
* The lifecycle and placement of an account as lines of its cell: nothing for an active account with its score, a
|
|
185
|
-
* canceled one with its lapse, a lapsed one as never placed on.
|
|
188
|
+
* canceled one with its lapse, a lapsed one as never placed on; and the renewal its owner set, unless it lapsed.
|
|
186
189
|
*/
|
|
187
190
|
const placementLines = (accountArg, nowArg) => [
|
|
188
191
|
...accountArg.lifecycle === 'lapsed' ? ['lapsed · never placed on']
|
|
189
192
|
: accountArg.lifecycle === 'canceled' && accountArg.lapsesAt !== null
|
|
190
193
|
? [`canceled · lapses in ${compactUntil(accountArg.lapsesAt, nowArg)}`] : [],
|
|
194
|
+
...accountArg.lifecycle === 'lapsed' || accountArg.renewal === null ? []
|
|
195
|
+
: [renewalLine(accountArg.renewal, accountArg.lifecycle, nowArg)],
|
|
191
196
|
...accountArg.lifecycle === 'lapsed' ? []
|
|
192
197
|
: [`placement ${placementScoreText(accountArg.placementScore)}${accountArg.placementEligibility === 'last_resort'
|
|
193
198
|
? ' · last resort' : ''}`],
|
|
194
199
|
];
|
|
200
|
+
/**
|
|
201
|
+
* The renewal line of an account cell: `renews in 9d 4h (set by the owner)`. A canceled account does not renew, so
|
|
202
|
+
* placement ignores it then, and the line says so.
|
|
203
|
+
*/
|
|
204
|
+
const renewalLine = (renewalArg, lifecycleArg, nowArg) => `renews in ${compactUntil(renewalArg.at, nowArg)} (set by the owner${lifecycleArg === 'canceled'
|
|
205
|
+
? ', ignored while it lapses' : ''})`;
|
|
195
206
|
/** A placement score as a cell shows it: percent per hour, or `unscored` without a counted window. */
|
|
196
207
|
const placementScoreText = (scoreArg) => scoreArg === null ? 'unscored'
|
|
197
208
|
: `${scoreArg < 10 ? scoreArg.toFixed(2) : Math.round(scoreArg)}%/h`;
|
|
@@ -204,7 +215,7 @@ const accountCell = (accountArg, nowArg) => [
|
|
|
204
215
|
plainText(accountArg.plan === null ? 'plan not reported' : `${accountArg.plan} plan`),
|
|
205
216
|
...accountArg.paymentProblem === null ? [] : [`payment problem since ${asOfTime(accountArg.paymentProblem.at, nowArg)}`],
|
|
206
217
|
...limitLines(accountArg.maxUsagePercent, accountArg.limit, nowArg),
|
|
207
|
-
...placementLines({ lifecycle: accountArg.lifecycle, lapsesAt: accountArg.lapsesAt,
|
|
218
|
+
...placementLines({ lifecycle: accountArg.lifecycle, lapsesAt: accountArg.lapsesAt, renewal: accountArg.renewal,
|
|
208
219
|
placementScore: accountArg.placement.score, placementEligibility: accountArg.placement.eligibility }, nowArg),
|
|
209
220
|
...accountArg.loginHealth === null ? ['no login']
|
|
210
221
|
: accountArg.loginHealth === 'ready' ? []
|
|
@@ -257,4 +268,4 @@ export const renderAuthSwitchLimitList = async (outArg, limitsArg, nowArg) => {
|
|
|
257
268
|
groups: { divider: account, colorLine: (rowArg) => rowArg.providerId },
|
|
258
269
|
});
|
|
259
270
|
};
|
|
260
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"authority-overview.js","sourceRoot":"","sources":["../../ts_authswitch/authority-overview.ts"],"names":[],"mappings":"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"}
|
|
271
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"authority-overview.js","sourceRoot":"","sources":["../../ts_authswitch/authority-overview.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Where a new session goes: an account's lifecycle against its lapse date, and how much of its usage it can spend per
|
|
3
|
-
* hour before that usage resets
|
|
4
|
-
* command line and `agl proxy status` show it; an existing session keeps its account for the prompt cache and
|
|
5
|
-
* placed again by it.
|
|
3
|
+
* hour before that usage resets, the account lapses or it renews. The inference proxy places new sessions by it, and the
|
|
4
|
+
* authswitch command line and `agl proxy status` show it; an existing session keeps its account for the prompt cache and
|
|
5
|
+
* is never placed again by it.
|
|
6
6
|
*
|
|
7
|
-
* Besides types, the module imports only the limit rule of `authority-usagelimit.ts`, the window reader it uses
|
|
8
|
-
* spend month of `authority-spend.ts`, whose own imports carry nothing to a
|
|
9
|
-
* nothing behind it.
|
|
7
|
+
* Besides types, the module imports only the limit rule of `authority-usagelimit.ts`, the window reader it uses, the
|
|
8
|
+
* spend month of `authority-spend.ts` and the renewal of `authority-renewal.ts`, whose own imports carry nothing to a
|
|
9
|
+
* page, so it bundles for a browser with nothing behind it.
|
|
10
10
|
*/
|
|
11
11
|
import type { TAuthSwitchUsageReading } from './classes.authorityusage.js';
|
|
12
12
|
/**
|
|
@@ -26,8 +26,8 @@ export interface IAuthSwitchPlacement {
|
|
|
26
26
|
eligibility: TAuthSwitchPlacementEligibility;
|
|
27
27
|
/**
|
|
28
28
|
* The percent of its usage the account can spend per hour and still stay within every counted window before that
|
|
29
|
-
* window resets
|
|
30
|
-
* reading counts no window.
|
|
29
|
+
* window resets, the account lapses or it renews, whichever comes first; the smallest over its counted windows.
|
|
30
|
+
* `null` when the reading counts no window.
|
|
31
31
|
*/
|
|
32
32
|
score: number | null;
|
|
33
33
|
}
|
|
@@ -35,19 +35,23 @@ export interface IAuthSwitchPlacement {
|
|
|
35
35
|
export declare const authSwitchAccountLifecycle: (lapsesAtArg: string | null, nowArg: number) => TAuthSwitchAccountLifecycle;
|
|
36
36
|
/**
|
|
37
37
|
* Where an account stands for a new session at `nowArg`, from its usage reading (`null` when none is held), its usage
|
|
38
|
-
* threshold and its
|
|
38
|
+
* threshold, its lapse date and its renewal anchor (`IAuthSwitchAccount.renewsAt`, `null` when its owner set none).
|
|
39
39
|
*
|
|
40
40
|
* The score is taken over the windows the account's limit counts (`authSwitchCountedWindows`). Per window it is the
|
|
41
41
|
* headroom left below the threshold -- the percent the limit decides by, the estimate between reads where present --
|
|
42
|
-
* divided by the hours until the window's deadline: its reset,
|
|
43
|
-
* least an hour. Usage that resets soon, or is lost when the account
|
|
44
|
-
* days; placing by it uses that first and spares the accounts that
|
|
42
|
+
* divided by the hours until the window's deadline: the earliest of its reset, the account's lapse and its next renewal
|
|
43
|
+
* (`authSwitchNextRenewal` from `nowArg`), and at least an hour. Usage that resets soon, or is lost when the account
|
|
44
|
+
* lapses, is worth more now than usage that stays for days; placing by it uses that first and spares the accounts that
|
|
45
|
+
* reset later. Usage a window still holds at the renewal counts the same way, as spent by the renewal. Whether a
|
|
46
|
+
* provider's windows reset at a renewal is not known: the renewal is a scoring deadline only, and eligibility, lifecycle
|
|
47
|
+
* and capacity never read it. An account with a lapse date ignores its renewal, since a canceled subscription does not
|
|
48
|
+
* renew.
|
|
45
49
|
*
|
|
46
50
|
* An API key's spend reading whose month ended (`authSwitchSpendMonthEnded`, as `authSwitchUsageLimit` judges it) says
|
|
47
51
|
* nothing about the current month, which starts with nothing spent: its window counts as 0% used, with the end of the
|
|
48
52
|
* current month (`authSwitchSpendPeriod`) as its reset.
|
|
49
53
|
*/
|
|
50
|
-
export declare const authSwitchPlacement: (readingArg: TAuthSwitchUsageReading | null, maxUsagePercentArg: number | null, lapsesAtArg: string | null, nowArg: number, reserveLiftUntilArg?: string | null) => IAuthSwitchPlacement;
|
|
54
|
+
export declare const authSwitchPlacement: (readingArg: TAuthSwitchUsageReading | null, maxUsagePercentArg: number | null, lapsesAtArg: string | null, renewalAnchorArg: string | null, nowArg: number, reserveLiftUntilArg?: string | null) => IAuthSwitchPlacement;
|
|
51
55
|
/** An account as placement ranks it: its score, whether it is a last resort, and its headroom below its threshold. */
|
|
52
56
|
export interface IAuthSwitchPlacementRank {
|
|
53
57
|
id: string;
|
|
@@ -58,8 +62,8 @@ export interface IAuthSwitchPlacementRank {
|
|
|
58
62
|
/**
|
|
59
63
|
* The order a new session is placed in: an account that lapses within `lapseHorizonMs` only after every other one;
|
|
60
64
|
* then by the account's score shared among the requests it serves now -- `score / (1 + in flight)`, so new sessions
|
|
61
|
-
* spread over the accounts in proportion to what each can spend per hour, and usage that resets or
|
|
62
|
-
* spent first -- then by headroom and id. An account without a counted window comes after every scored
|
|
63
|
-
* busy of them first.
|
|
65
|
+
* spread over the accounts in proportion to what each can spend per hour, and usage that resets, lapses or meets a
|
|
66
|
+
* renewal soon is spent first -- then by headroom and id. An account without a counted window comes after every scored
|
|
67
|
+
* one, the least busy of them first.
|
|
64
68
|
*/
|
|
65
69
|
export declare const authSwitchPlacementOrder: (inFlightArg: (accountIdArg: string) => number) => (left: IAuthSwitchPlacementRank, right: IAuthSwitchPlacementRank) => number;
|
|
@@ -1,43 +1,36 @@
|
|
|
1
1
|
import { authSwitchCountedWindows, authSwitchEffectiveMaxUsage } from './authority-usagelimit.js';
|
|
2
|
-
import { authSwitchUsageWindowPercent } from './authority-usagewindows.js';
|
|
2
|
+
import { authSwitchUsageWindowPercent, authSwitchUsageWindowResetAt } from './authority-usagewindows.js';
|
|
3
3
|
import { authSwitchSpendMonthEnded, authSwitchSpendPeriod } from './authority-spend.js';
|
|
4
|
+
import { authSwitchNextRenewal } from './authority-renewal.js';
|
|
4
5
|
/** How close to its lapse an account takes new sessions only as a last resort: a day. */
|
|
5
6
|
export const lapseHorizonMs = 86_400_000;
|
|
6
7
|
/** The shortest time a window's headroom is spread over, so a window about to reset does not score without bound. */
|
|
7
8
|
const minimumDeadlineMs = 3_600_000;
|
|
8
9
|
/** An account's lifecycle at `nowArg` (epoch milliseconds) by its lapse date (`IAuthSwitchAccount.lapsesAt`). */
|
|
9
10
|
export const authSwitchAccountLifecycle = (lapsesAtArg, nowArg) => lapsesAtArg === null ? 'active' : Date.parse(lapsesAtArg) <= nowArg ? 'lapsed' : 'canceled';
|
|
10
|
-
/**
|
|
11
|
-
* When a window's current period ends, after `nowArg`: its stated reset; a reset that passed and was not read again yet
|
|
12
|
-
* moved forward by whole window lengths, as the provider starts each period; `nowArg` plus the window's length when
|
|
13
|
-
* the reading names no reset.
|
|
14
|
-
*/
|
|
15
|
-
const windowResetAt = (windowArg, nowArg) => {
|
|
16
|
-
const lengthMs = windowArg.durationSeconds * 1000;
|
|
17
|
-
const stated = windowArg.resetAt === null ? Number.NaN : Date.parse(windowArg.resetAt);
|
|
18
|
-
if (!Number.isFinite(stated))
|
|
19
|
-
return nowArg + (lengthMs > 0 ? lengthMs : 0);
|
|
20
|
-
if (stated > nowArg || !(lengthMs > 0))
|
|
21
|
-
return stated;
|
|
22
|
-
return stated + (Math.floor((nowArg - stated) / lengthMs) + 1) * lengthMs;
|
|
23
|
-
};
|
|
24
11
|
/**
|
|
25
12
|
* Where an account stands for a new session at `nowArg`, from its usage reading (`null` when none is held), its usage
|
|
26
|
-
* threshold and its
|
|
13
|
+
* threshold, its lapse date and its renewal anchor (`IAuthSwitchAccount.renewsAt`, `null` when its owner set none).
|
|
27
14
|
*
|
|
28
15
|
* The score is taken over the windows the account's limit counts (`authSwitchCountedWindows`). Per window it is the
|
|
29
16
|
* headroom left below the threshold -- the percent the limit decides by, the estimate between reads where present --
|
|
30
|
-
* divided by the hours until the window's deadline: its reset,
|
|
31
|
-
* least an hour. Usage that resets soon, or is lost when the account
|
|
32
|
-
* days; placing by it uses that first and spares the accounts that
|
|
17
|
+
* divided by the hours until the window's deadline: the earliest of its reset, the account's lapse and its next renewal
|
|
18
|
+
* (`authSwitchNextRenewal` from `nowArg`), and at least an hour. Usage that resets soon, or is lost when the account
|
|
19
|
+
* lapses, is worth more now than usage that stays for days; placing by it uses that first and spares the accounts that
|
|
20
|
+
* reset later. Usage a window still holds at the renewal counts the same way, as spent by the renewal. Whether a
|
|
21
|
+
* provider's windows reset at a renewal is not known: the renewal is a scoring deadline only, and eligibility, lifecycle
|
|
22
|
+
* and capacity never read it. An account with a lapse date ignores its renewal, since a canceled subscription does not
|
|
23
|
+
* renew.
|
|
33
24
|
*
|
|
34
25
|
* An API key's spend reading whose month ended (`authSwitchSpendMonthEnded`, as `authSwitchUsageLimit` judges it) says
|
|
35
26
|
* nothing about the current month, which starts with nothing spent: its window counts as 0% used, with the end of the
|
|
36
27
|
* current month (`authSwitchSpendPeriod`) as its reset.
|
|
37
28
|
*/
|
|
38
|
-
export const authSwitchPlacement = (readingArg, maxUsagePercentArg, lapsesAtArg, nowArg, reserveLiftUntilArg = null) => {
|
|
29
|
+
export const authSwitchPlacement = (readingArg, maxUsagePercentArg, lapsesAtArg, renewalAnchorArg, nowArg, reserveLiftUntilArg = null) => {
|
|
39
30
|
const lifecycle = authSwitchAccountLifecycle(lapsesAtArg, nowArg);
|
|
40
31
|
const lapsesAt = lapsesAtArg === null ? Infinity : Date.parse(lapsesAtArg);
|
|
32
|
+
const renewsAt = lapsesAtArg !== null || renewalAnchorArg === null ? Infinity
|
|
33
|
+
: authSwitchNextRenewal(renewalAnchorArg, nowArg);
|
|
41
34
|
const eligibility = lifecycle === 'lapsed' ? 'never'
|
|
42
35
|
: lapsesAt - nowArg <= lapseHorizonMs ? 'last_resort' : 'normal';
|
|
43
36
|
const threshold = authSwitchEffectiveMaxUsage(maxUsagePercentArg, reserveLiftUntilArg, nowArg) ?? 100;
|
|
@@ -45,8 +38,8 @@ export const authSwitchPlacement = (readingArg, maxUsagePercentArg, lapsesAtArg,
|
|
|
45
38
|
const spendMonthEnded = readingArg?.kind === 'spend' && authSwitchSpendMonthEnded(readingArg.spend, nowArg);
|
|
46
39
|
const scores = windows.map((windowArg) => {
|
|
47
40
|
const headroom = spendMonthEnded ? threshold : Math.max(0, threshold - authSwitchUsageWindowPercent(windowArg));
|
|
48
|
-
const resetAt = spendMonthEnded ? Date.parse(authSwitchSpendPeriod(nowArg).end) :
|
|
49
|
-
const deadline = Math.min(resetAt, lapsesAt);
|
|
41
|
+
const resetAt = spendMonthEnded ? Date.parse(authSwitchSpendPeriod(nowArg).end) : authSwitchUsageWindowResetAt(windowArg, nowArg);
|
|
42
|
+
const deadline = Math.min(resetAt, lapsesAt, renewsAt);
|
|
50
43
|
return headroom / (Math.max(deadline - nowArg, minimumDeadlineMs) / 3_600_000);
|
|
51
44
|
});
|
|
52
45
|
return { lifecycle, eligibility, score: scores.length ? Math.min(...scores) : null };
|
|
@@ -54,9 +47,9 @@ export const authSwitchPlacement = (readingArg, maxUsagePercentArg, lapsesAtArg,
|
|
|
54
47
|
/**
|
|
55
48
|
* The order a new session is placed in: an account that lapses within `lapseHorizonMs` only after every other one;
|
|
56
49
|
* then by the account's score shared among the requests it serves now -- `score / (1 + in flight)`, so new sessions
|
|
57
|
-
* spread over the accounts in proportion to what each can spend per hour, and usage that resets or
|
|
58
|
-
* spent first -- then by headroom and id. An account without a counted window comes after every scored
|
|
59
|
-
* busy of them first.
|
|
50
|
+
* spread over the accounts in proportion to what each can spend per hour, and usage that resets, lapses or meets a
|
|
51
|
+
* renewal soon is spent first -- then by headroom and id. An account without a counted window comes after every scored
|
|
52
|
+
* one, the least busy of them first.
|
|
60
53
|
*/
|
|
61
54
|
export const authSwitchPlacementOrder = (inFlightArg) => (left, right) => Number(left.lastResort) - Number(right.lastResort)
|
|
62
55
|
|| Number(left.score === null) - Number(right.score === null)
|
|
@@ -64,4 +57,4 @@ export const authSwitchPlacementOrder = (inFlightArg) => (left, right) => Number
|
|
|
64
57
|
? right.score / (1 + inFlightArg(right.id)) - left.score / (1 + inFlightArg(left.id))
|
|
65
58
|
: inFlightArg(left.id) - inFlightArg(right.id))
|
|
66
59
|
|| right.headroom - left.headroom || left.id.localeCompare(right.id);
|
|
67
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aG9yaXR5LXBsYWNlbWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzX2F1dGhzd2l0Y2gvYXV0aG9yaXR5LXBsYWNlbWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFXQSxPQUFPLEVBQUUsd0JBQXdCLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUNsRyxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUN6RyxPQUFPLEVBQUUseUJBQXlCLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN4RixPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQWMvRCx5RkFBeUY7QUFDekYsTUFBTSxDQUFDLE1BQU0sY0FBYyxHQUFHLFVBQVUsQ0FBQztBQUV6QyxxSEFBcUg7QUFDckgsTUFBTSxpQkFBaUIsR0FBRyxTQUFTLENBQUM7QUFhcEMsaUhBQWlIO0FBQ2pILE1BQU0sQ0FBQyxNQUFNLDBCQUEwQixHQUFHLENBQUMsV0FBMEIsRUFBRSxNQUFjLEVBQStCLEVBQUUsQ0FDcEgsV0FBVyxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxJQUFJLE1BQU0sQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUM7QUFFOUY7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBaUJHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sbUJBQW1CLEdBQUcsQ0FBQyxVQUEwQyxFQUFFLGtCQUFpQyxFQUMvRyxXQUEwQixFQUFFLGdCQUErQixFQUFFLE1BQWMsRUFDM0UsbUJBQW1CLEdBQWtCLElBQUksRUFBd0IsRUFBRTtJQUNuRSxNQUFNLFNBQVMsR0FBRywwQkFBMEIsQ0FBQyxXQUFXLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDbEUsTUFBTSxRQUFR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
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A Claude sign-in's monthly renewal (AGL-1644), as its owner set it: the anchor is one date and time the subscription
|
|
3
|
+
* renewed or renews (`IAuthSwitchAccount.renewsAt`), and every renewal is a calendar month from it. AGL derives no
|
|
4
|
+
* renewal from anything a provider states; the owner sets the anchor, and nothing else does.
|
|
5
|
+
*
|
|
6
|
+
* Whether a provider's usage windows reset at the renewal is not known. Placement uses the renewal only as a deadline
|
|
7
|
+
* (`authority-placement.ts`): usage still held at the renewal counts as spent by then.
|
|
8
|
+
*
|
|
9
|
+
* The module imports nothing, so it bundles for a browser as it is.
|
|
10
|
+
*/
|
|
11
|
+
/**
|
|
12
|
+
* The renewal anchor rule, the one the authority applies to `authswitch.authority.renewal`: a date-time `Date.parse`
|
|
13
|
+
* reads, in any year from 2000 to 9999, as the lapse date rule (`isAuthSwitchLapsesAt`). A past anchor is valid: the
|
|
14
|
+
* next renewal is a whole number of months after it. A consumer validates with this rather than restating it; the
|
|
15
|
+
* authority stores the anchor as its ISO 8601 UTC form and answers any other value with the `invalid_input` refusal.
|
|
16
|
+
*/
|
|
17
|
+
export declare const isAuthSwitchRenewsAt: (value: unknown) => value is string;
|
|
18
|
+
/**
|
|
19
|
+
* The first monthly renewal strictly after `nowArg` (epoch milliseconds), as epoch milliseconds, from the anchor
|
|
20
|
+
* `anchorArg` (`isAuthSwitchRenewsAt`). An anchor still ahead is itself the next renewal. Every renewal is computed from
|
|
21
|
+
* the anchor, never from the renewal before it: the anchor's UTC day, clamped to the month's last day, at the anchor's
|
|
22
|
+
* UTC time, so an anchor on January 31st renews on February 28th (29th in a leap year) and again on March 31st.
|
|
23
|
+
* Throws for an anchor the rule refuses or a `nowArg` that is not a finite number.
|
|
24
|
+
*/
|
|
25
|
+
export declare const authSwitchNextRenewal: (anchorArg: string, nowArg: number) => number;
|
|
26
|
+
/** An account's next renewal as the account lists and `agl proxy status` show it; `source` says who set it. */
|
|
27
|
+
export interface IAuthSwitchRenewal {
|
|
28
|
+
/** The next renewal, ISO 8601 UTC (`authSwitchNextRenewal`). */
|
|
29
|
+
at: string;
|
|
30
|
+
/** `manual`: the owner set the anchor. AGL derives no renewal, so there is no other source. */
|
|
31
|
+
source: 'manual';
|
|
32
|
+
}
|
|
33
|
+
/** The next renewal of an account with the anchor `renewsAtArg` at `nowArg`, or `null` without an anchor. */
|
|
34
|
+
export declare const authSwitchRenewal: (renewsAtArg: string | null, nowArg: number) => IAuthSwitchRenewal | null;
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A Claude sign-in's monthly renewal (AGL-1644), as its owner set it: the anchor is one date and time the subscription
|
|
3
|
+
* renewed or renews (`IAuthSwitchAccount.renewsAt`), and every renewal is a calendar month from it. AGL derives no
|
|
4
|
+
* renewal from anything a provider states; the owner sets the anchor, and nothing else does.
|
|
5
|
+
*
|
|
6
|
+
* Whether a provider's usage windows reset at the renewal is not known. Placement uses the renewal only as a deadline
|
|
7
|
+
* (`authority-placement.ts`): usage still held at the renewal counts as spent by then.
|
|
8
|
+
*
|
|
9
|
+
* The module imports nothing, so it bundles for a browser as it is.
|
|
10
|
+
*/
|
|
11
|
+
/**
|
|
12
|
+
* The renewal anchor rule, the one the authority applies to `authswitch.authority.renewal`: a date-time `Date.parse`
|
|
13
|
+
* reads, in any year from 2000 to 9999, as the lapse date rule (`isAuthSwitchLapsesAt`). A past anchor is valid: the
|
|
14
|
+
* next renewal is a whole number of months after it. A consumer validates with this rather than restating it; the
|
|
15
|
+
* authority stores the anchor as its ISO 8601 UTC form and answers any other value with the `invalid_input` refusal.
|
|
16
|
+
*/
|
|
17
|
+
export const isAuthSwitchRenewsAt = (value) => {
|
|
18
|
+
if (typeof value !== 'string' || value.length > 64)
|
|
19
|
+
return false;
|
|
20
|
+
const at = Date.parse(value);
|
|
21
|
+
return Number.isFinite(at) && at >= Date.UTC(2000, 0, 1) && at < Date.UTC(10000, 0, 1);
|
|
22
|
+
};
|
|
23
|
+
/** The renewal `monthsArg` months after the anchor: the anchor's UTC day clamped to that month, at the anchor's UTC time. */
|
|
24
|
+
const renewalAfter = (anchor, monthsArg) => {
|
|
25
|
+
const year = anchor.getUTCFullYear();
|
|
26
|
+
const month = anchor.getUTCMonth() + monthsArg;
|
|
27
|
+
// Day 0 of the following month is the last day of this one; `Date.UTC` carries a month past December into the year.
|
|
28
|
+
const lastDay = new Date(Date.UTC(year, month + 1, 0)).getUTCDate();
|
|
29
|
+
const timeOfDay = anchor.getTime() - Date.UTC(year, anchor.getUTCMonth(), anchor.getUTCDate());
|
|
30
|
+
return Date.UTC(year, month, Math.min(anchor.getUTCDate(), lastDay)) + timeOfDay;
|
|
31
|
+
};
|
|
32
|
+
/**
|
|
33
|
+
* The first monthly renewal strictly after `nowArg` (epoch milliseconds), as epoch milliseconds, from the anchor
|
|
34
|
+
* `anchorArg` (`isAuthSwitchRenewsAt`). An anchor still ahead is itself the next renewal. Every renewal is computed from
|
|
35
|
+
* the anchor, never from the renewal before it: the anchor's UTC day, clamped to the month's last day, at the anchor's
|
|
36
|
+
* UTC time, so an anchor on January 31st renews on February 28th (29th in a leap year) and again on March 31st.
|
|
37
|
+
* Throws for an anchor the rule refuses or a `nowArg` that is not a finite number.
|
|
38
|
+
*/
|
|
39
|
+
export const authSwitchNextRenewal = (anchorArg, nowArg) => {
|
|
40
|
+
if (!isAuthSwitchRenewsAt(anchorArg) || !Number.isFinite(nowArg))
|
|
41
|
+
throw new Error('Invalid renewal anchor or time.');
|
|
42
|
+
const anchor = new Date(Date.parse(anchorArg));
|
|
43
|
+
if (anchor.getTime() > nowArg)
|
|
44
|
+
return anchor.getTime();
|
|
45
|
+
const now = new Date(nowArg);
|
|
46
|
+
// The whole months between the two, less one, lie at or before now; count up from there.
|
|
47
|
+
let months = Math.max(0, (now.getUTCFullYear() - anchor.getUTCFullYear()) * 12
|
|
48
|
+
+ now.getUTCMonth() - anchor.getUTCMonth() - 1);
|
|
49
|
+
while (renewalAfter(anchor, months) <= nowArg)
|
|
50
|
+
months += 1;
|
|
51
|
+
return renewalAfter(anchor, months);
|
|
52
|
+
};
|
|
53
|
+
/** The next renewal of an account with the anchor `renewsAtArg` at `nowArg`, or `null` without an anchor. */
|
|
54
|
+
export const authSwitchRenewal = (renewsAtArg, nowArg) => renewsAtArg === null ? null
|
|
55
|
+
: { at: new Date(authSwitchNextRenewal(renewsAtArg, nowArg)).toISOString(), source: 'manual' };
|
|
56
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aG9yaXR5LXJlbmV3YWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90c19hdXRoc3dpdGNoL2F1dGhvcml0eS1yZW5ld2FsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7R0FTRztBQUVIOzs7OztHQUtHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sb0JBQW9CLEdBQUcsQ0FBQyxLQUFjLEVBQW1CLEVBQUU7SUFDdEUsSUFBSSxPQUFPLEtBQUssS0FBSyxRQUFRLElBQUksS0FBSyxDQUFDLE1BQU0sR0FBRyxFQUFFO1FBQUUsT0FBTyxLQUFLLENBQUM7SUFDakUsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUM3QixPQUFPLE1BQU0sQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLElBQUksRUFBRSxJQUFJLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsSUFBSSxFQUFFLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBQ3pGLENBQUMsQ0FBQztBQUVGLDZIQUE2SDtBQUM3SCxNQUFNLFlBQVksR0FBRyxDQUFDLE1BQVksRUFBRSxTQUFpQixFQUFVLEVBQUU7SUFDL0QsTUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLGNBQWMsRUFBRSxDQUFDO0lBQ3JDLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxXQUFXLEVBQUUsR0FBRyxTQUFTLENBQUM7SUFDL0Msb0hBQW9IO0lBQ3BILE1BQU0sT0FBTyxHQUFHLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLEtBQUssR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUNwRSxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsT0FBTyxFQUFFLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLFdBQVcsRUFBRSxFQUFFLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDO0lBQy9GLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLFVBQVUsRUFBRSxFQUFFLE9BQU8sQ0FBQyxDQUFDLEdBQUcsU0FBUyxDQUFDO0FBQ25GLENBQUMsQ0FBQztBQUVGOzs7Ozs7R0FNRztBQUNILE1BQU0sQ0FBQyxNQUFNLHFCQUFxQixHQUFHLENBQUMsU0FBaUIsRUFBRSxNQUFjLEVBQVUsRUFBRTtJQUNqRixJQUFJLENBQUMsb0JBQW9CLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQztRQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsaUNBQWlDLENBQUMsQ0FBQztJQUNySCxNQUFNLE1BQU0sR0FBRyxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUM7SUFDL0MsSUFBSSxNQUFNLENBQUMsT0FBTyxFQUFFLEdBQUcsTUFBTTtRQUFFLE9BQU8sTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ3ZELE1BQU0sR0FBRyxHQUFHLElBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQzdCLHlGQUF5RjtJQUN6RixJQUFJLE1BQU0sR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxDQUFDLEdBQUcsQ0FBQyxjQUFjLEVBQUUsR0FBRyxNQUFNLENBQUMsY0FBYyxFQUFFLENBQUMsR0FBRyxFQUFFO1VBQzFFLEdBQUcsQ0FBQyxXQUFXLEVBQUUsR0FBRyxNQUFNLENBQUMsV0FBVyxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUM7SUFDbEQsT0FBTyxZQUFZLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxJQUFJLE1BQU07UUFBRSxNQUFNLElBQUksQ0FBQyxDQUFDO0lBQzNELE9BQU8sWUFBWSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQztBQUN0QyxDQUFDLENBQUM7QUFVRiw2R0FBNkc7QUFDN0csTUFBTSxDQUFDLE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxXQUEwQixFQUFFLE1BQWMsRUFBNkIsRUFBRSxDQUN6RyxXQUFXLEtBQUssSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFJO0lBQ3pCLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxJQUFJLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxXQUFXLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLENBQUMifQ==
|
|
@@ -64,6 +64,35 @@ export declare const authSwitchEffectiveMaxUsage: (maxArg: number | null, untilA
|
|
|
64
64
|
* to how it reads usage, not to what a reading says.
|
|
65
65
|
*/
|
|
66
66
|
export declare const authSwitchUsageLimit: (readingArg: TAuthSwitchUsageReading, maxUsagePercentArg: number | null, nowArg: number, reserveLiftUntilArg?: string | null) => IAuthSwitchUsageLimit;
|
|
67
|
+
/** One moment an account's headroom is projected to change (epoch milliseconds), and its headroom from then on. */
|
|
68
|
+
export interface IAuthSwitchHeadroomStep {
|
|
69
|
+
at: number;
|
|
70
|
+
headroom: number;
|
|
71
|
+
}
|
|
72
|
+
/** How an account's headroom stands and is projected to change, from its reading alone (see `authSwitchHeadroomGrowth`). */
|
|
73
|
+
export interface IAuthSwitchHeadroomGrowth {
|
|
74
|
+
/** The headroom now, as `authSwitchUsageLimit` states it; `null` when the reading counts no window. */
|
|
75
|
+
headroom: number | null;
|
|
76
|
+
/**
|
|
77
|
+
* The counted window the headroom is bound by: of the windows at the headroom, the one whose period ends last (one
|
|
78
|
+
* whose end the reading does not state last of all), since the headroom grows only once each of them started a new
|
|
79
|
+
* period; `null` without a counted window.
|
|
80
|
+
*/
|
|
81
|
+
binding: IAuthSwitchUsageWindow | null;
|
|
82
|
+
/** The moments the headroom changes, in order, each with the headroom from then on; empty when none is foreseen. */
|
|
83
|
+
steps: IAuthSwitchHeadroomStep[];
|
|
84
|
+
}
|
|
85
|
+
/**
|
|
86
|
+
* When an account's headroom (`authSwitchUsageLimit`) changes, as far as its reading foresees it at `nowArg`: each
|
|
87
|
+
* counted window starts a new period at its reset (`authSwitchUsageWindowResetAt`, a stated reset that passed moved on by
|
|
88
|
+
* whole lengths), from then on with nothing used, and an active reserve lift ends at its expiry, which brings the
|
|
89
|
+
* threshold back to `maxUsagePercentArg`. The headroom is the least of the windows' at every moment, so it grows only
|
|
90
|
+
* once every window at the least has reset: a binding 5-hour window lifts it at its own reset, long before a weekly
|
|
91
|
+
* window that is not binding. A window whose reading names no reset holds its headroom for as long as the projection
|
|
92
|
+
* runs. Usage spent meanwhile is not foreseen, so each step is the most the headroom can be then. An API key's month
|
|
93
|
+
* leaves all of its limit at the month's end. Pure, and bundles for a browser as the rest of the module does.
|
|
94
|
+
*/
|
|
95
|
+
export declare const authSwitchHeadroomGrowth: (readingArg: TAuthSwitchUsageReading, maxUsagePercentArg: number | null, nowArg: number, reserveLiftUntilArg?: string | null) => IAuthSwitchHeadroomGrowth;
|
|
67
96
|
/**
|
|
68
97
|
* A limit's state in words, as a list or a badge shows it: `available`, `reserved (80% of weekly used)`,
|
|
69
98
|
* `at its limit (weekly)`, or `at its limit` when the provider refuses requests without naming a window.
|