@cortexkit/opencode-antigravity-auth 3.0.21 → 3.0.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.js +279 -246
- package/dist/cli.js.map +3 -3
- package/dist/cli.meta.json +38 -13
- package/dist/index.js +766 -360
- package/dist/index.js.map +4 -4
- package/dist/index.meta.json +95 -20
- package/dist/server.js +785 -379
- package/dist/server.js.map +4 -4
- package/dist/server.meta.json +1 -1
- package/dist/src/common-auth-embedded/fs/refresh-file-lock.js +2 -2
- package/dist/src/common-auth-embedded/fs/with-lock.js +37 -10
- package/dist/src/common-auth-embedded/quota/format.d.ts +9 -4
- package/dist/src/common-auth-embedded/quota/format.js +45 -26
- package/dist/src/common-auth-embedded/quota-sidebar/index.tsx +56 -32
- package/dist/src/common-auth-embedded/routing-accessor/index.d.ts +62 -0
- package/dist/src/common-auth-embedded/routing-accessor/index.js +128 -0
- package/dist/src/common-auth-embedded/source-output.json +42 -22
- package/dist/src/plugin/__fixtures__/verified-store.js +2 -2
- package/dist/src/plugin/index.d.ts.map +1 -1
- package/dist/src/plugin/index.js +2 -0
- package/dist/src/plugin/index.js.map +1 -1
- package/dist/src/plugin/request.d.ts.map +1 -1
- package/dist/src/plugin/request.js +1 -0
- package/dist/src/plugin/request.js.map +1 -1
- package/dist/src/plugin/shared/request-services.d.ts +6 -0
- package/dist/src/plugin/shared/request-services.d.ts.map +1 -1
- package/dist/src/plugin/shared/request-services.js +89 -2
- package/dist/src/plugin/shared/request-services.js.map +1 -1
- package/dist/src/plugin/shared/vault-request-credentials.d.ts.map +1 -1
- package/dist/src/plugin/shared/vault-request-credentials.js +4 -0
- package/dist/src/plugin/shared/vault-request-credentials.js.map +1 -1
- package/dist/src/plugin/shared/vault-routing-purpose.d.ts +12 -0
- package/dist/src/plugin/shared/vault-routing-purpose.d.ts.map +1 -0
- package/dist/src/plugin/shared/vault-routing-purpose.js +18 -0
- package/dist/src/plugin/shared/vault-routing-purpose.js.map +1 -0
- package/dist/src/plugin/shared/vault-routing.d.ts +36 -0
- package/dist/src/plugin/shared/vault-routing.d.ts.map +1 -0
- package/dist/src/plugin/shared/vault-routing.js +213 -0
- package/dist/src/plugin/shared/vault-routing.js.map +1 -0
- package/dist/src/plugin/types.d.ts +1 -0
- package/dist/src/plugin/types.d.ts.map +1 -1
- package/dist/src/tui/sidebar-frame.d.ts.map +1 -1
- package/dist/src/tui/sidebar-frame.js +18 -16
- package/dist/src/tui/sidebar-frame.js.map +1 -1
- package/dist/tui-build-map.json +13 -13
- package/dist/tui-ga-build-map.json +13 -13
- package/dist/types/src/common-auth-embedded/quota/format.d.ts +9 -4
- package/dist/types/src/common-auth-embedded/routing-accessor/index.d.ts +62 -0
- package/dist/types/src/plugin/index.d.ts.map +1 -1
- package/dist/types/src/plugin/request.d.ts.map +1 -1
- package/dist/types/src/plugin/shared/request-services.d.ts +6 -0
- package/dist/types/src/plugin/shared/request-services.d.ts.map +1 -1
- package/dist/types/src/plugin/shared/vault-request-credentials.d.ts.map +1 -1
- package/dist/types/src/plugin/shared/vault-routing-purpose.d.ts +12 -0
- package/dist/types/src/plugin/shared/vault-routing-purpose.d.ts.map +1 -0
- package/dist/types/src/plugin/shared/vault-routing.d.ts +36 -0
- package/dist/types/src/plugin/shared/vault-routing.d.ts.map +1 -0
- package/dist/types/src/plugin/types.d.ts +1 -0
- package/dist/types/src/plugin/types.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/common-auth-embedded/fs/refresh-file-lock.js +2 -2
- package/src/common-auth-embedded/fs/with-lock.js +37 -10
- package/src/common-auth-embedded/quota/format.d.ts +9 -4
- package/src/common-auth-embedded/quota/format.js +45 -26
- package/src/common-auth-embedded/quota-sidebar/index.tsx +56 -32
- package/src/common-auth-embedded/routing-accessor/index.d.ts +62 -0
- package/src/common-auth-embedded/routing-accessor/index.js +128 -0
- package/src/common-auth-embedded/source-output.json +42 -22
- package/src/tui-compiled/common-auth-embedded/quota/format.js +45 -26
- package/src/tui-compiled/common-auth-embedded/quota-sidebar/index.js +165 -148
- package/src/tui-compiled/tui/sidebar-frame.js +17 -16
- package/src/tui-ga-compiled/shared/aef2402f8fc342f0-format.js +45 -26
- package/src/tui-ga-compiled/shared/ced204104a639c9c-sidebar-frame.js +17 -16
- package/src/tui-ga-compiled/shared/e4ec36f367492969-index.js +165 -148
- package/src/tui-ga-raw/shared/aef2402f8fc342f0-format.js +45 -26
- package/src/tui-ga-raw/shared/ced204104a639c9c-sidebar-frame.tsx +21 -19
- package/src/tui-ga-raw/shared/e4ec36f367492969-index.tsx +56 -32
- package/src/tui-raw/common-auth-embedded/quota/format.js +45 -26
- package/src/tui-raw/common-auth-embedded/quota-sidebar/index.tsx +56 -32
- package/src/tui-raw/tui/sidebar-frame.tsx +21 -19
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
/** An eligible vault route, not a local pool row. */
|
|
2
|
+
export interface RoutingCandidate {
|
|
3
|
+
/** Vault account id, not the plugin's route id. */
|
|
4
|
+
accountId: string;
|
|
5
|
+
credentialId: string;
|
|
6
|
+
}
|
|
7
|
+
export interface AskRoutingInput<Candidate extends RoutingCandidate = RoutingCandidate> {
|
|
8
|
+
sessionId: string;
|
|
9
|
+
provider: string;
|
|
10
|
+
modelId: string;
|
|
11
|
+
/** Only routes already eligible under the plugin's vault and killswitch rules. */
|
|
12
|
+
candidates: readonly Candidate[];
|
|
13
|
+
/** Defaults to 500 ms, clamped to 1–2000 ms. */
|
|
14
|
+
deadlineMs?: number;
|
|
15
|
+
}
|
|
16
|
+
export interface RoutingHold {
|
|
17
|
+
/** Uncapped advice from routing. The plugin must apply its own hold cap. */
|
|
18
|
+
retry_after_ms: number;
|
|
19
|
+
}
|
|
20
|
+
export interface RoutingSelection<Candidate extends RoutingCandidate = RoutingCandidate> {
|
|
21
|
+
/** The original eligible candidate, including any plugin-specific metadata. */
|
|
22
|
+
candidate: Candidate;
|
|
23
|
+
hold?: RoutingHold;
|
|
24
|
+
}
|
|
25
|
+
interface RoutingReportIdentity {
|
|
26
|
+
sessionId: string;
|
|
27
|
+
accountId: string;
|
|
28
|
+
credentialId?: string;
|
|
29
|
+
}
|
|
30
|
+
export type ReportRoutingInput = RoutingReportIdentity & ({
|
|
31
|
+
outcome: 'served';
|
|
32
|
+
/**
|
|
33
|
+
* Pass only rate-limit headers, never the whole response headers.
|
|
34
|
+
* Values are forwarded unchanged; do not include tokens, emails or labels.
|
|
35
|
+
*/
|
|
36
|
+
headers: Readonly<Record<string, string>>;
|
|
37
|
+
} | {
|
|
38
|
+
outcome: 'exhausted';
|
|
39
|
+
/** The exhausted quota window; keep scoped quota groups in `pool`. */
|
|
40
|
+
window: '5h' | '7d';
|
|
41
|
+
/**
|
|
42
|
+
* Scoped quota group, such as `non-gemini`.
|
|
43
|
+
* Must be a non-empty string without `:`. Omit to block the whole
|
|
44
|
+
* account; include to block only this pool.
|
|
45
|
+
*/
|
|
46
|
+
pool?: string;
|
|
47
|
+
/** Optional reset time in epoch milliseconds. */
|
|
48
|
+
resetsAt?: number;
|
|
49
|
+
});
|
|
50
|
+
/**
|
|
51
|
+
* Ask routing for an eligible vault route. Any failure or unfamiliar answer
|
|
52
|
+
* yields undefined so the plugin can keep its own choice. This does not admit
|
|
53
|
+
* routes: callers must exclude vault refusals and killswitch-blocked accounts.
|
|
54
|
+
*/
|
|
55
|
+
export declare function askRouting<Candidate extends RoutingCandidate>(input: AskRoutingInput<Candidate>): Promise<RoutingSelection<Candidate> | undefined>;
|
|
56
|
+
/**
|
|
57
|
+
* Report a vault request without waiting for routing. Only contract fields are
|
|
58
|
+
* sent, and all accessor failures are ignored. Headers must already be limited
|
|
59
|
+
* to rate-limit headers by the caller; values are not filtered or redacted here.
|
|
60
|
+
*/
|
|
61
|
+
export declare function reportRouting(input: ReportRoutingInput): void;
|
|
62
|
+
export {};
|
|
@@ -0,0 +1,128 @@
|
|
|
1
|
+
// Optional THALAMUS routing for vault mode only. Account ids here are vault
|
|
2
|
+
// account ids; local pool rows are not known to the routing engine.
|
|
3
|
+
function isObject(value) {
|
|
4
|
+
return typeof value === 'object' && value !== null;
|
|
5
|
+
}
|
|
6
|
+
function routingHandle(sessionId) {
|
|
7
|
+
// The bridge can load after the auth plugin, so never cache the accessor.
|
|
8
|
+
const routing = Reflect.get(globalThis, Symbol.for('cortexkit.routing'));
|
|
9
|
+
if (typeof routing !== 'function')
|
|
10
|
+
return undefined;
|
|
11
|
+
const handle = routing(sessionId);
|
|
12
|
+
return isObject(handle) ? handle : undefined;
|
|
13
|
+
}
|
|
14
|
+
function selectionFor(answer, candidates) {
|
|
15
|
+
if (!isObject(answer))
|
|
16
|
+
return undefined;
|
|
17
|
+
const accountId = answer.account_id;
|
|
18
|
+
const credentialId = answer.credential_id;
|
|
19
|
+
if (typeof accountId !== 'string')
|
|
20
|
+
return undefined;
|
|
21
|
+
if (credentialId !== undefined && typeof credentialId !== 'string') {
|
|
22
|
+
return undefined;
|
|
23
|
+
}
|
|
24
|
+
const candidate = candidates.find((route) => route.accountId === accountId &&
|
|
25
|
+
(credentialId === undefined || route.credentialId === credentialId));
|
|
26
|
+
if (!candidate)
|
|
27
|
+
return undefined;
|
|
28
|
+
const hold = answer.hold;
|
|
29
|
+
const retryAfterMs = isObject(hold) ? hold.retry_after_ms : undefined;
|
|
30
|
+
if (typeof retryAfterMs === 'number' &&
|
|
31
|
+
Number.isFinite(retryAfterMs) &&
|
|
32
|
+
retryAfterMs >= 0) {
|
|
33
|
+
return { candidate, hold: { retry_after_ms: retryAfterMs } };
|
|
34
|
+
}
|
|
35
|
+
return { candidate };
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Ask routing for an eligible vault route. Any failure or unfamiliar answer
|
|
39
|
+
* yields undefined so the plugin can keep its own choice. This does not admit
|
|
40
|
+
* routes: callers must exclude vault refusals and killswitch-blocked accounts.
|
|
41
|
+
*/
|
|
42
|
+
export async function askRouting(input) {
|
|
43
|
+
let timer;
|
|
44
|
+
try {
|
|
45
|
+
const handle = routingHandle(input.sessionId);
|
|
46
|
+
if (!handle)
|
|
47
|
+
return undefined;
|
|
48
|
+
const accountFor = handle.accountFor;
|
|
49
|
+
if (typeof accountFor !== 'function')
|
|
50
|
+
return undefined;
|
|
51
|
+
const requested = input.deadlineMs ?? 500;
|
|
52
|
+
const deadlineMs = Number.isNaN(requested)
|
|
53
|
+
? 500
|
|
54
|
+
: Math.min(2000, Math.max(1, requested));
|
|
55
|
+
const expired = new Promise((resolve) => {
|
|
56
|
+
timer = setTimeout(() => resolve(undefined), deadlineMs);
|
|
57
|
+
timer.unref();
|
|
58
|
+
});
|
|
59
|
+
const pending = accountFor.call(handle, { provider: input.provider, modelId: input.modelId }, { deadlineMs });
|
|
60
|
+
if (!isObject(pending) || typeof pending.then !== 'function')
|
|
61
|
+
return undefined;
|
|
62
|
+
const answer = await Promise.race([pending, expired]);
|
|
63
|
+
return selectionFor(answer, input.candidates);
|
|
64
|
+
}
|
|
65
|
+
catch {
|
|
66
|
+
// The process-global bridge is optional and must not break authentication.
|
|
67
|
+
return undefined;
|
|
68
|
+
}
|
|
69
|
+
finally {
|
|
70
|
+
clearTimeout(timer);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* Report a vault request without waiting for routing. Only contract fields are
|
|
75
|
+
* sent, and all accessor failures are ignored. Headers must already be limited
|
|
76
|
+
* to rate-limit headers by the caller; values are not filtered or redacted here.
|
|
77
|
+
*/
|
|
78
|
+
export function reportRouting(input) {
|
|
79
|
+
try {
|
|
80
|
+
const handle = routingHandle(input.sessionId);
|
|
81
|
+
if (!handle)
|
|
82
|
+
return;
|
|
83
|
+
const report = handle.report;
|
|
84
|
+
if (typeof report !== 'function')
|
|
85
|
+
return;
|
|
86
|
+
const identity = {
|
|
87
|
+
account_id: input.accountId,
|
|
88
|
+
...(input.credentialId !== undefined
|
|
89
|
+
? { credential_id: input.credentialId }
|
|
90
|
+
: {}),
|
|
91
|
+
};
|
|
92
|
+
let payload;
|
|
93
|
+
switch (input.outcome) {
|
|
94
|
+
case 'served':
|
|
95
|
+
payload = { ...identity, outcome: 'served', headers: input.headers };
|
|
96
|
+
break;
|
|
97
|
+
case 'exhausted': {
|
|
98
|
+
const { window, pool } = input;
|
|
99
|
+
if (window !== '5h' && window !== '7d')
|
|
100
|
+
return;
|
|
101
|
+
// An undefined pool means the whole account, as an omitted one does.
|
|
102
|
+
if (pool !== undefined &&
|
|
103
|
+
(typeof pool !== 'string' || pool.length === 0 || pool.includes(':')))
|
|
104
|
+
return;
|
|
105
|
+
payload = {
|
|
106
|
+
...identity,
|
|
107
|
+
outcome: 'exhausted',
|
|
108
|
+
window,
|
|
109
|
+
...(pool ? { pool } : {}),
|
|
110
|
+
...(input.resetsAt !== undefined
|
|
111
|
+
? { resets_at: input.resetsAt }
|
|
112
|
+
: {}),
|
|
113
|
+
};
|
|
114
|
+
break;
|
|
115
|
+
}
|
|
116
|
+
default:
|
|
117
|
+
return;
|
|
118
|
+
}
|
|
119
|
+
// A broken bridge may return a rejected promise despite its void contract.
|
|
120
|
+
const pending = report.call(handle, payload);
|
|
121
|
+
if (isObject(pending) && typeof pending.then === 'function') {
|
|
122
|
+
void Promise.resolve(pending).catch(() => { });
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
catch {
|
|
126
|
+
// Reporting must never change the result of an auth request.
|
|
127
|
+
}
|
|
128
|
+
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"schema": 1,
|
|
3
3
|
"package": "@cortexkit/common-auth",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.33.0",
|
|
5
5
|
"artifactStatus": "published",
|
|
6
6
|
"publicRoots": {
|
|
7
7
|
"./rpc": {
|
|
@@ -60,20 +60,24 @@
|
|
|
60
60
|
"types": "./dist/opencode2/index.d.ts",
|
|
61
61
|
"import": "./dist/opencode2/index.js"
|
|
62
62
|
},
|
|
63
|
+
"./routing-accessor": {
|
|
64
|
+
"types": "./dist/routing-accessor/index.d.ts",
|
|
65
|
+
"import": "./dist/routing-accessor/index.js"
|
|
66
|
+
},
|
|
63
67
|
"./quota-sidebar": {
|
|
64
68
|
"types": "./dist/quota-sidebar/index.d.ts",
|
|
65
69
|
"import": "./src/quota-sidebar/index.tsx"
|
|
66
70
|
}
|
|
67
71
|
},
|
|
68
|
-
"input": "tools/common-auth-build/inputs/cortexkit-common-auth-0.
|
|
69
|
-
"tarballSha256": "
|
|
70
|
-
"sri": "sha512-
|
|
71
|
-
"canonicalFiles":
|
|
72
|
-
"canonicalBytes":
|
|
72
|
+
"input": "tools/common-auth-build/inputs/cortexkit-common-auth-0.33.0.tgz",
|
|
73
|
+
"tarballSha256": "bba9f56f7fb353c9c712113722c7c9361f0e13e930c73f57314185b13032a24c",
|
|
74
|
+
"sri": "sha512-cbbyqXTK1TYQZNHb2xA/ueZGQsBvAX6H9hTlQcZZxM7SR/u7tsscyBAWw38ViXl1n/gwkqgsvs2Vbs6cZ0hOrw==",
|
|
75
|
+
"canonicalFiles": 199,
|
|
76
|
+
"canonicalBytes": 1277160,
|
|
73
77
|
"generator": {
|
|
74
78
|
"path": "packages/opencode/scripts/embed-common-auth.ts",
|
|
75
79
|
"version": 4,
|
|
76
|
-
"sha256": "
|
|
80
|
+
"sha256": "9f9ebaeb47c9c18874ed832504422c0791551627c34092885cb481c6fe23ef19"
|
|
77
81
|
},
|
|
78
82
|
"files": [
|
|
79
83
|
{
|
|
@@ -631,9 +635,9 @@
|
|
|
631
635
|
{
|
|
632
636
|
"source": "package/dist/fs/refresh-file-lock.js",
|
|
633
637
|
"output": "fs/refresh-file-lock.js",
|
|
634
|
-
"bytes":
|
|
635
|
-
"sourceSha256": "
|
|
636
|
-
"outputSha256": "
|
|
638
|
+
"bytes": 37831,
|
|
639
|
+
"sourceSha256": "e0fdcc7a45548f3c88ea49bbe000f6e4022fb9c219f0510aa934492adb72a505",
|
|
640
|
+
"outputSha256": "e0fdcc7a45548f3c88ea49bbe000f6e4022fb9c219f0510aa934492adb72a505",
|
|
637
641
|
"transform": "verbatim"
|
|
638
642
|
},
|
|
639
643
|
{
|
|
@@ -647,9 +651,9 @@
|
|
|
647
651
|
{
|
|
648
652
|
"source": "package/dist/fs/with-lock.js",
|
|
649
653
|
"output": "fs/with-lock.js",
|
|
650
|
-
"bytes":
|
|
651
|
-
"sourceSha256": "
|
|
652
|
-
"outputSha256": "
|
|
654
|
+
"bytes": 3003,
|
|
655
|
+
"sourceSha256": "690fb43c6a0eb6a02eac024b8b58caa39775a37d0064118dab879a0e5ac8c996",
|
|
656
|
+
"outputSha256": "690fb43c6a0eb6a02eac024b8b58caa39775a37d0064118dab879a0e5ac8c996",
|
|
653
657
|
"transform": "verbatim"
|
|
654
658
|
},
|
|
655
659
|
{
|
|
@@ -879,17 +883,17 @@
|
|
|
879
883
|
{
|
|
880
884
|
"source": "package/dist/quota/format.d.ts",
|
|
881
885
|
"output": "quota/format.d.ts",
|
|
882
|
-
"bytes":
|
|
883
|
-
"sourceSha256": "
|
|
884
|
-
"outputSha256": "
|
|
886
|
+
"bytes": 5816,
|
|
887
|
+
"sourceSha256": "1865f4a06b8bd06b3dda73b59a7becc3eb2d13036134c1a34b8b6dce12678f21",
|
|
888
|
+
"outputSha256": "1865f4a06b8bd06b3dda73b59a7becc3eb2d13036134c1a34b8b6dce12678f21",
|
|
885
889
|
"transform": "verbatim"
|
|
886
890
|
},
|
|
887
891
|
{
|
|
888
892
|
"source": "package/dist/quota/format.js",
|
|
889
893
|
"output": "quota/format.js",
|
|
890
|
-
"bytes":
|
|
891
|
-
"sourceSha256": "
|
|
892
|
-
"outputSha256": "
|
|
894
|
+
"bytes": 18881,
|
|
895
|
+
"sourceSha256": "ffd69317391a225fb8e75550c22ea401480626cde762c52e61001955952ee013",
|
|
896
|
+
"outputSha256": "ffd69317391a225fb8e75550c22ea401480626cde762c52e61001955952ee013",
|
|
893
897
|
"transform": "verbatim"
|
|
894
898
|
},
|
|
895
899
|
{
|
|
@@ -1647,9 +1651,25 @@
|
|
|
1647
1651
|
{
|
|
1648
1652
|
"source": "package/src/quota-sidebar/index.tsx",
|
|
1649
1653
|
"output": "quota-sidebar/index.tsx",
|
|
1650
|
-
"bytes":
|
|
1651
|
-
"sourceSha256": "
|
|
1652
|
-
"outputSha256": "
|
|
1654
|
+
"bytes": 19762,
|
|
1655
|
+
"sourceSha256": "f35e4fd7b218110756bd04357c5b8c4bbb64be5012aefc7d7a7c1ab303d483ae",
|
|
1656
|
+
"outputSha256": "f35e4fd7b218110756bd04357c5b8c4bbb64be5012aefc7d7a7c1ab303d483ae",
|
|
1657
|
+
"transform": "verbatim"
|
|
1658
|
+
},
|
|
1659
|
+
{
|
|
1660
|
+
"source": "package/dist/routing-accessor/index.d.ts",
|
|
1661
|
+
"output": "routing-accessor/index.d.ts",
|
|
1662
|
+
"bytes": 2486,
|
|
1663
|
+
"sourceSha256": "8bc146aea3903fad91ece61f0022251e8a45086ac11afa86ce93ec7bb2c05436",
|
|
1664
|
+
"outputSha256": "8bc146aea3903fad91ece61f0022251e8a45086ac11afa86ce93ec7bb2c05436",
|
|
1665
|
+
"transform": "verbatim"
|
|
1666
|
+
},
|
|
1667
|
+
{
|
|
1668
|
+
"source": "package/dist/routing-accessor/index.js",
|
|
1669
|
+
"output": "routing-accessor/index.js",
|
|
1670
|
+
"bytes": 4967,
|
|
1671
|
+
"sourceSha256": "ff1fb189de19874df1edf25a64425bad2ca23013a6e392ab3247138cdd57b240",
|
|
1672
|
+
"outputSha256": "ff1fb189de19874df1edf25a64425bad2ca23013a6e392ab3247138cdd57b240",
|
|
1653
1673
|
"transform": "verbatim"
|
|
1654
1674
|
}
|
|
1655
1675
|
],
|
|
@@ -5,10 +5,10 @@
|
|
|
5
5
|
//
|
|
6
6
|
// The rules: a window is named by its length (`5h`, `7d`), or, for a window
|
|
7
7
|
// that binds only one model family, by the label the plugin stored it under.
|
|
8
|
-
// Every figure is "% left". A window the provider did not
|
|
9
|
-
// record or a retirement tombstone) is left out rather than
|
|
10
|
-
// reported". A reset is a short time from now (`resets 2h`).
|
|
11
|
-
// than fifteen minutes says how old it is (`checked 3h ago`).
|
|
8
|
+
// Every reported window figure is "% left". A window the provider did not
|
|
9
|
+
// report (an absence record or a retirement tombstone) is left out rather than
|
|
10
|
+
// written as "not reported". A reset is a short time from now (`resets 2h`).
|
|
11
|
+
// A reading older than fifteen minutes says how old it is (`checked 3h ago`).
|
|
12
12
|
//
|
|
13
13
|
// Like the rest of this module it reads no clock: `now` is a parameter.
|
|
14
14
|
import { ALL_SCOPE } from "./map.js";
|
|
@@ -97,12 +97,14 @@ function displayOrder(left, right) {
|
|
|
97
97
|
return left.label < right.label ? -1 : left.label > right.label ? 1 : 0;
|
|
98
98
|
}
|
|
99
99
|
/**
|
|
100
|
-
* Structured quota wording for layouts that need one row per window.
|
|
101
|
-
*
|
|
102
|
-
*
|
|
100
|
+
* Structured quota wording for layouts that need one row per window.
|
|
101
|
+
* Windows without a dated percentage remain as explicit unknown parts. Limits
|
|
102
|
+
* marked absent (not reported) or retired (no longer tracked) remain omitted.
|
|
103
|
+
* Reported windows, future resets and the optional age keep the shared
|
|
104
|
+
* formatter's wording and order.
|
|
103
105
|
*/
|
|
104
106
|
export function quotaWindowParts(quota, options) {
|
|
105
|
-
const { windows, age } = scopedWindowParts(quota, options);
|
|
107
|
+
const { windows, age } = scopedWindowParts(quota, options, true);
|
|
106
108
|
const parts = windows.map(({ part }) => part);
|
|
107
109
|
return age === undefined ? { windows: parts } : { windows: parts, age };
|
|
108
110
|
}
|
|
@@ -125,34 +127,47 @@ function withShortNames(windows) {
|
|
|
125
127
|
}
|
|
126
128
|
return windows;
|
|
127
129
|
}
|
|
130
|
+
function hasWindowReading(limit) {
|
|
131
|
+
return (Number.isFinite(limit.remainingPercent) && Number.isFinite(limit.checkedAt));
|
|
132
|
+
}
|
|
128
133
|
/**
|
|
129
134
|
* `quotaWindowParts` with each window's scope kept beside it. The narrow form
|
|
130
135
|
* needs the scope to name and pick model-scoped windows; the public parts do
|
|
131
|
-
* not carry
|
|
136
|
+
* not carry the scope.
|
|
132
137
|
*/
|
|
133
|
-
function scopedWindowParts(quota, options) {
|
|
138
|
+
function scopedWindowParts(quota, options, includeUnknown = false) {
|
|
134
139
|
if (!quota)
|
|
135
140
|
return { windows: [] };
|
|
136
141
|
const { now } = options;
|
|
137
142
|
const readings = quota.limits
|
|
138
|
-
.filter((limit) => limit.kind === 'reading' &&
|
|
143
|
+
.filter((limit) => limit.kind === 'reading' && (includeUnknown || hasWindowReading(limit)))
|
|
139
144
|
.sort(displayOrder);
|
|
140
145
|
const windows = readings.map((limit) => {
|
|
141
|
-
const
|
|
142
|
-
|
|
143
|
-
scope: limit.scope,
|
|
144
|
-
...(limit.windowMinutes === undefined
|
|
145
|
-
? {}
|
|
146
|
-
: { windowMinutes: limit.windowMinutes }),
|
|
147
|
-
part: {
|
|
146
|
+
const part = hasWindowReading(limit)
|
|
147
|
+
? {
|
|
148
148
|
kind: 'window',
|
|
149
|
+
reading: 'known',
|
|
149
150
|
name: quotaWindowName(limit),
|
|
150
151
|
short: '',
|
|
151
|
-
figure: percentLeft(limit.remainingPercent
|
|
152
|
-
remainingPercent,
|
|
152
|
+
figure: percentLeft(limit.remainingPercent),
|
|
153
|
+
remainingPercent: clampPercent(limit.remainingPercent),
|
|
153
154
|
checkedAt: limit.checkedAt,
|
|
154
155
|
...resetDetails(limit.resetsAt, limit.checkedAt, now),
|
|
155
|
-
}
|
|
156
|
+
}
|
|
157
|
+
: {
|
|
158
|
+
kind: 'window',
|
|
159
|
+
reading: 'unknown',
|
|
160
|
+
name: quotaWindowName(limit),
|
|
161
|
+
short: '',
|
|
162
|
+
figure: 'no reading',
|
|
163
|
+
resetSinceReading: false,
|
|
164
|
+
};
|
|
165
|
+
return {
|
|
166
|
+
scope: limit.scope,
|
|
167
|
+
...(limit.windowMinutes === undefined
|
|
168
|
+
? {}
|
|
169
|
+
: { windowMinutes: limit.windowMinutes }),
|
|
170
|
+
part,
|
|
156
171
|
};
|
|
157
172
|
});
|
|
158
173
|
const budget = quota.budget;
|
|
@@ -168,6 +183,7 @@ function scopedWindowParts(quota, options) {
|
|
|
168
183
|
spent: budget.reached,
|
|
169
184
|
part: {
|
|
170
185
|
kind: 'budget',
|
|
186
|
+
reading: 'known',
|
|
171
187
|
name: 'credits',
|
|
172
188
|
short: '',
|
|
173
189
|
figure,
|
|
@@ -180,8 +196,11 @@ function scopedWindowParts(quota, options) {
|
|
|
180
196
|
});
|
|
181
197
|
}
|
|
182
198
|
withShortNames(windows);
|
|
183
|
-
|
|
184
|
-
|
|
199
|
+
const readingTimes = windows.flatMap(({ part }) => part.reading === 'known' && part.checkedAt !== undefined
|
|
200
|
+
? [part.checkedAt]
|
|
201
|
+
: []);
|
|
202
|
+
if (readingTimes.length > 0) {
|
|
203
|
+
const age = now - Math.min(...readingTimes);
|
|
185
204
|
if (age > (options.staleAfterMs ?? QUOTA_STALE_AFTER_MS)) {
|
|
186
205
|
return { windows, age: `checked ${shortSpan(age)} ago` };
|
|
187
206
|
}
|
|
@@ -357,13 +376,13 @@ function narrowTextParts(quota, options) {
|
|
|
357
376
|
export function quotaTextParts(quota, options) {
|
|
358
377
|
if (options.form === 'narrow')
|
|
359
378
|
return narrowTextParts(quota, options);
|
|
360
|
-
const
|
|
379
|
+
const { windows, age } = scopedWindowParts(quota, options);
|
|
361
380
|
const full = (options.form ?? 'full') === 'full';
|
|
362
|
-
const text =
|
|
381
|
+
const text = windows.map(({ part }) => {
|
|
363
382
|
const reset = full && part.resetIn ? `, resets ${part.resetIn}` : '';
|
|
364
383
|
return `${part.kind === 'budget' ? '' : `${part.name} `}${part.figure}${reset}`;
|
|
365
384
|
});
|
|
366
|
-
return
|
|
385
|
+
return age === undefined ? text : [...text, age];
|
|
367
386
|
}
|
|
368
387
|
/**
|
|
369
388
|
* A row's quota as one line: `5h 58% left · 7d 90% left` in the compact
|