@aeolus-fleet/trierarch-plugin 0.34.0 → 0.36.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/adapters/fleet/console-sessions.js +2 -1
- package/dist/adapters/fleet/console-sessions.js.map +1 -1
- package/dist/adapters/fleet/core-version.d.ts +1 -1
- package/dist/adapters/fleet/core-version.js +1 -1
- package/dist/adapters/fleet/rest-fleet-door.js +6 -2
- package/dist/adapters/fleet/rest-fleet-door.js.map +1 -1
- package/dist/adapters/prisma/usage-history.d.ts +3 -1
- package/dist/adapters/prisma/usage-history.js +35 -6
- package/dist/adapters/prisma/usage-history.js.map +1 -1
- package/dist/adapters/trpc/router.d.ts +39 -0
- package/dist/app.js +43 -3
- package/dist/app.js.map +1 -1
- package/dist/core/connection/answer-pings.d.ts +15 -3
- package/dist/core/connection/answer-pings.js +22 -8
- package/dist/core/connection/answer-pings.js.map +1 -1
- package/dist/core/connection/ports.d.ts +7 -0
- package/dist/core/usage/keep-usage.d.ts +25 -0
- package/dist/core/usage/keep-usage.js +50 -0
- package/dist/core/usage/keep-usage.js.map +1 -0
- package/dist/core/usage/ports.d.ts +3 -1
- package/dist/core/usage/prune-usage.d.ts +33 -0
- package/dist/core/usage/prune-usage.js +33 -0
- package/dist/core/usage/prune-usage.js.map +1 -0
- package/package.json +3 -3
- package/src/adapters/prisma/migrations/20261031220000_usage_read_covering/migration.sql +10 -0
|
@@ -7,7 +7,8 @@
|
|
|
7
7
|
import { consoleSessionOutputSchema } from '@aeolus-fleet/common';
|
|
8
8
|
import { z } from 'zod';
|
|
9
9
|
import { err, ok } from '../../core/shared/result.js';
|
|
10
|
-
|
|
10
|
+
// Only what the plugin reads: a core older than common's schema answers fewer fields (MINIMUM_CORE_VERSION).
|
|
11
|
+
const sessionAnswer = z.object({ result: z.object({ data: consoleSessionOutputSchema.pick({ fleetId: true, kind: true, scopes: true }) }) });
|
|
11
12
|
export function createFleetConsoleSessions(fleetUrl) {
|
|
12
13
|
return {
|
|
13
14
|
check: async (cookie) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console-sessions.js","sourceRoot":"","sources":["../../../src/adapters/fleet/console-sessions.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,6BAA6B,CAAC;AAEtD,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,0BAA0B,EAAE,CAAC,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"console-sessions.js","sourceRoot":"","sources":["../../../src/adapters/fleet/console-sessions.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,6BAA6B,CAAC;AAEtD,6GAA6G;AAC7G,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,0BAA0B,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;AAE7I,MAAM,UAAU,0BAA0B,CAAC,QAAgB;IACzD,OAAO;QACL,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YACtB,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,QAAQ,uBAAuB,EAAE,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;YAC1F,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,OAAO,GAAG,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,8BAA8B,EAAE,CAAC,CAAC;YAChF,CAAC;YACD,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;YACzF,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACvC,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type VersionFetch } from '@aeolus-fleet/common';
|
|
2
2
|
/** The oldest core the trierarch plugin runs against (decision 0049, docs/compatibility.md). */
|
|
3
|
-
export declare const MINIMUM_CORE_VERSION = "0.
|
|
3
|
+
export declare const MINIMUM_CORE_VERSION = "0.34.0";
|
|
4
4
|
/** What the check reads the version with and waits on; tests replace them. */
|
|
5
5
|
export interface CoreVersionOptions {
|
|
6
6
|
readonly fetch?: VersionFetch;
|
|
@@ -2,7 +2,7 @@ import { coreVersionRefusal } from '@aeolus-fleet/common';
|
|
|
2
2
|
import { ConfigError } from '../../config.js';
|
|
3
3
|
import { runningVersion } from '../http/version.js';
|
|
4
4
|
/** The oldest core the trierarch plugin runs against (decision 0049, docs/compatibility.md). */
|
|
5
|
-
export const MINIMUM_CORE_VERSION = '0.
|
|
5
|
+
export const MINIMUM_CORE_VERSION = '0.34.0';
|
|
6
6
|
/** How long the start waits for a core that does not answer, such as one restarting beside it. */
|
|
7
7
|
const CORE_WAIT_MS = 60_000;
|
|
8
8
|
const CORE_RETRY_INTERVAL_MS = 2_000;
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* `busyWaitMs`), so a send keeps its idempotency key.
|
|
8
8
|
*/
|
|
9
9
|
import { setTimeout as wait } from 'node:timers/promises';
|
|
10
|
-
import { busyWaitMs, commissionShipOutputSchema, declareNetworkRulesOutputSchema, declareScopesOutputSchema, defineLabelOutputSchema, FLEET_BUSY_WAITS_MS, fleetListOutputSchema, idSchema, isInReadReach, labelsOutputSchema, PAGE_SIZE_MAX, receiveOutputSchema, scopesOutputSchema, shipDetailOutputSchema } from '@aeolus-fleet/common';
|
|
10
|
+
import { busyWaitMs, commissionShipOutputSchema, declareNetworkRulesOutputSchema, declareScopesOutputSchema, defineLabelOutputSchema, FLEET_BUSY_WAITS_MS, fleetLimitsOutputSchema, fleetListOutputSchema, idSchema, isInReadReach, labelsOutputSchema, PAGE_SIZE_MAX, receiveOutputSchema, scopesOutputSchema, shipDetailOutputSchema } from '@aeolus-fleet/common';
|
|
11
11
|
import { z } from 'zod';
|
|
12
12
|
import { err, ok } from '../../core/shared/result.js';
|
|
13
13
|
const refusalSchema = z.object({ code: z.string(), message: z.string() });
|
|
@@ -144,6 +144,10 @@ export function createRestFleetDoor(fleetUrl, options = {}) {
|
|
|
144
144
|
const claimed = await call({ path: '/fleet/assignCrew', method: 'POST', crewToken, body: claim, answers: z.unknown() });
|
|
145
145
|
return claimed.isOk ? ok(undefined) : claimed;
|
|
146
146
|
},
|
|
147
|
+
limits: async (crewToken) => {
|
|
148
|
+
const read = await call({ path: '/fleet/limits', method: 'GET', crewToken, answers: fleetLimitsOutputSchema });
|
|
149
|
+
return read.isOk ? ok({ retentionDays: read.value.retention.days }) : read;
|
|
150
|
+
},
|
|
147
151
|
listLabels: async (crewToken) => {
|
|
148
152
|
const listed = await call({ path: '/fleet/labels', method: 'GET', crewToken, answers: labelsOutputSchema });
|
|
149
153
|
return listed.isOk
|
|
@@ -199,7 +203,7 @@ export function createRestFleetDoor(fleetUrl, options = {}) {
|
|
|
199
203
|
inbox: {
|
|
200
204
|
receive: async (crewToken, max) => {
|
|
201
205
|
const taken = await call({ path: '/ship/receive', method: 'POST', crewToken, body: { max }, answers: receiveOutputSchema });
|
|
202
|
-
return taken.isOk ? ok(taken.value.deliveries.map(({ deliveryId, contentType, senderShipId }) => ({ deliveryId, contentType, senderShipId }))) : taken;
|
|
206
|
+
return taken.isOk ? ok(taken.value.deliveries.map(({ deliveryId, contentType, senderShipId, senderType, payload }) => ({ deliveryId, contentType, senderShipId, senderType, payload }))) : taken;
|
|
203
207
|
},
|
|
204
208
|
ack: async (crewToken, deliveryId) => {
|
|
205
209
|
const acked = await call({ path: '/ship/ack', method: 'POST', crewToken, body: { deliveryId }, answers: z.unknown() });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest-fleet-door.js","sourceRoot":"","sources":["../../../src/adapters/fleet/rest-fleet-door.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"rest-fleet-door.js","sourceRoot":"","sources":["../../../src/adapters/fleet/rest-fleet-door.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
import type { UsageHistory } from '../../core/usage/ports.js';
|
|
2
2
|
import type { PrismaClient } from './client.js';
|
|
3
|
-
export declare function createPrismaUsageHistory(db: PrismaClient
|
|
3
|
+
export declare function createPrismaUsageHistory(db: PrismaClient, options?: {
|
|
4
|
+
pruneBatchSize?: number;
|
|
5
|
+
}): UsageHistory;
|
|
@@ -1,6 +1,25 @@
|
|
|
1
1
|
import { Prisma } from './generated/client.js';
|
|
2
|
-
|
|
2
|
+
/** How many rows of one table a prune deletes per statement, so a large prune never holds one long lock. */
|
|
3
|
+
const PRUNE_BATCH_SIZE = 5000;
|
|
4
|
+
const HOUR_MS = 60 * 60_000;
|
|
5
|
+
const DAY_MS = 24 * HOUR_MS;
|
|
6
|
+
/** Deletes rows of a fleet a batch at a time until a batch comes back short. */
|
|
7
|
+
async function pruneInBatches(deleteBatch, batchSize) {
|
|
8
|
+
while ((await deleteBatch()) === batchSize) {
|
|
9
|
+
// A full batch: more may wait.
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
export function createPrismaUsageHistory(db, options = {}) {
|
|
13
|
+
const pruneBatchSize = options.pruneBatchSize ?? PRUNE_BATCH_SIZE;
|
|
3
14
|
return {
|
|
15
|
+
// A row goes once all it covers is before the cutoff: an hour that ended by then, a UTC day that ended by then, a reading read before it.
|
|
16
|
+
prune: async (fleetId, before) => {
|
|
17
|
+
const lastHour = new Date(before.getTime() - HOUR_MS);
|
|
18
|
+
const lastDayStart = new Date(before.getTime() - DAY_MS);
|
|
19
|
+
await pruneInBatches(() => db.$executeRaw `DELETE FROM usage_hours WHERE ctid IN (SELECT ctid FROM usage_hours WHERE fleet_id = ${fleetId} AND hour <= ${lastHour} LIMIT ${pruneBatchSize})`, pruneBatchSize);
|
|
20
|
+
await pruneInBatches(() => db.$executeRaw `DELETE FROM usage_days WHERE id IN (SELECT id FROM usage_days WHERE fleet_id = ${fleetId} AND day <= (${lastDayStart}::timestamptz AT TIME ZONE 'UTC')::date LIMIT ${pruneBatchSize})`, pruneBatchSize);
|
|
21
|
+
await pruneInBatches(() => db.$executeRaw `DELETE FROM subscription_readings WHERE ctid IN (SELECT ctid FROM subscription_readings WHERE fleet_id = ${fleetId} AND read_at < ${before} LIMIT ${pruneBatchSize})`, pruneBatchSize);
|
|
22
|
+
},
|
|
4
23
|
record: async (fleetId, reading) => {
|
|
5
24
|
await db.$transaction(async (tx) => {
|
|
6
25
|
const changes = [];
|
|
@@ -16,7 +35,14 @@ export function createPrismaUsageHistory(db) {
|
|
|
16
35
|
},
|
|
17
36
|
readTokens: async (fleetId, query) => {
|
|
18
37
|
const source = sourceOf(fleetId, query);
|
|
19
|
-
const [rows, unpriced] = await Promise.all([
|
|
38
|
+
const [rows, unpriced] = await Promise.all([
|
|
39
|
+
db.$transaction(async (tx) => {
|
|
40
|
+
// Room to add a range's rows up in memory by hash: at the target a week is some 76,000 rows, which the default spills to disk to sort.
|
|
41
|
+
await tx.$executeRaw `SET LOCAL work_mem = '64MB'`;
|
|
42
|
+
return tx.$queryRaw(bucketsQuery(source, query));
|
|
43
|
+
}),
|
|
44
|
+
db.$queryRaw(unpricedModelsQuery(source)),
|
|
45
|
+
]);
|
|
20
46
|
return toTokenUsage(rows, { splitBy: query.splitBy, unpricedModels: unpriced.map((row) => row.model) });
|
|
21
47
|
},
|
|
22
48
|
readValues: (fleetId, query) => db.$queryRaw(valuesQuery(fleetId, query)),
|
|
@@ -204,20 +230,23 @@ function filtersOf(filters) {
|
|
|
204
230
|
function bucketsQuery(source, query) {
|
|
205
231
|
const measure = query.measure === 'tokens' ? Prisma.sql `input + output + cache_read + cache_write` : Prisma.sql `cost_input + cost_output + cost_cache_read + cost_cache_write`;
|
|
206
232
|
// Raw only over AMOUNT_COLUMNS, this file's own constants: no input reaches it.
|
|
207
|
-
const sums = Prisma.raw(AMOUNT_COLUMNS.map((column) => `sum(p.${column}) AS ${column}`).join(', '));
|
|
208
233
|
const amounts = Prisma.raw(AMOUNT_COLUMNS.map((column) => `${column}::float8 AS ${column}`).join(', '));
|
|
234
|
+
// Summed as float8, as the read answers: numeric sums of every row cost more than the rest of the read.
|
|
235
|
+
const sums = Prisma.raw(AMOUNT_COLUMNS.map((column) => `sum(p.${column}::float8) AS ${column}`).join(', '));
|
|
236
|
+
// Only the keys' totals are ranked, a narrow aggregate; the rows take their key's rank by a hash join and are added up once, into
|
|
237
|
+
// at most 8 series per bucket. The join key stands in '' for the null key (a login not reported): no breakdown's value is ever empty.
|
|
209
238
|
return Prisma.sql `
|
|
210
239
|
WITH picked AS (${source.rows}),
|
|
211
240
|
ranked AS (
|
|
212
|
-
SELECT key, row_number() OVER (ORDER BY
|
|
213
|
-
FROM picked GROUP BY key
|
|
241
|
+
SELECT coalesce(key, '') AS join_key, row_number() OVER (ORDER BY total DESC, key ASC NULLS LAST) AS rank, count(*) OVER () AS keys
|
|
242
|
+
FROM (SELECT key, sum((${measure})::float8) AS total FROM picked GROUP BY key) AS totals
|
|
214
243
|
),
|
|
215
244
|
grouped AS (
|
|
216
245
|
SELECT p.at,
|
|
217
246
|
CASE WHEN r.keys > ${MOST_SERIES} AND r.rank > ${MOST_SERIES} THEN ${MOST_SERIES + 1} ELSE r.rank END AS rank,
|
|
218
247
|
CASE WHEN r.keys > ${MOST_SERIES} AND r.rank > ${MOST_SERIES} THEN NULL ELSE p.key END AS key,
|
|
219
248
|
${sums}
|
|
220
|
-
FROM picked p JOIN ranked r ON r.
|
|
249
|
+
FROM picked p JOIN ranked r ON r.join_key = coalesce(p.key, '')
|
|
221
250
|
GROUP BY 1, 2, 3
|
|
222
251
|
)
|
|
223
252
|
SELECT at, rank::int AS rank, key, ${amounts}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage-history.js","sourceRoot":"","sources":["../../../src/adapters/prisma/usage-history.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"usage-history.js","sourceRoot":"","sources":["../../../src/adapters/prisma/usage-history.ts"],"names":[],"mappings":"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"}
|
|
@@ -97,6 +97,19 @@ export declare const machineOutputSchema: z.ZodObject<{
|
|
|
97
97
|
riskyFlags: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
98
98
|
version: z.ZodOptional<z.ZodString>;
|
|
99
99
|
modelsConfirmedAt: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
|
|
100
|
+
login: z.ZodOptional<z.ZodObject<{
|
|
101
|
+
default: z.ZodEnum<{
|
|
102
|
+
subscription: "subscription";
|
|
103
|
+
apiKey: "apiKey";
|
|
104
|
+
}>;
|
|
105
|
+
key: z.ZodEnum<{
|
|
106
|
+
none: "none";
|
|
107
|
+
refused: "refused";
|
|
108
|
+
ready: "ready";
|
|
109
|
+
outOfCredit: "outOfCredit";
|
|
110
|
+
}>;
|
|
111
|
+
keyStateAt: z.ZodOptional<z.ZodISODateTime>;
|
|
112
|
+
}, z.core.$strict>>;
|
|
100
113
|
}, z.core.$strict>>;
|
|
101
114
|
workspaces: z.ZodObject<{
|
|
102
115
|
repositories: z.ZodArray<z.ZodString>;
|
|
@@ -133,6 +146,17 @@ export declare const machineOutputSchema: z.ZodObject<{
|
|
|
133
146
|
harness: z.ZodString;
|
|
134
147
|
reason: z.ZodString;
|
|
135
148
|
}, z.core.$strict>>>;
|
|
149
|
+
logins: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
150
|
+
shipId: z.ZodType<`shp_${string}`, unknown, z.core.$ZodTypeInternals<`shp_${string}`, unknown>>;
|
|
151
|
+
login: z.ZodEnum<{
|
|
152
|
+
subscription: "subscription";
|
|
153
|
+
apiKey: "apiKey";
|
|
154
|
+
}>;
|
|
155
|
+
next: z.ZodOptional<z.ZodEnum<{
|
|
156
|
+
subscription: "subscription";
|
|
157
|
+
apiKey: "apiKey";
|
|
158
|
+
}>>;
|
|
159
|
+
}, z.core.$strict>>>;
|
|
136
160
|
load: z.ZodOptional<z.ZodObject<{
|
|
137
161
|
memory: z.ZodObject<{
|
|
138
162
|
totalBytes: z.ZodInt;
|
|
@@ -165,6 +189,10 @@ export declare const machineOutputSchema: z.ZodObject<{
|
|
|
165
189
|
shipId: z.ZodType<`shp_${string}`, unknown, z.core.$ZodTypeInternals<`shp_${string}`, unknown>>;
|
|
166
190
|
models: z.ZodArray<z.ZodObject<{
|
|
167
191
|
model: z.ZodString;
|
|
192
|
+
login: z.ZodOptional<z.ZodEnum<{
|
|
193
|
+
subscription: "subscription";
|
|
194
|
+
apiKey: "apiKey";
|
|
195
|
+
}>>;
|
|
168
196
|
tokens: z.ZodObject<{
|
|
169
197
|
input: z.ZodInt;
|
|
170
198
|
output: z.ZodInt;
|
|
@@ -350,6 +378,11 @@ export declare const trierarchPluginRouter: import("@trpc/server").TRPCBuiltRout
|
|
|
350
378
|
riskyFlags?: string[] | undefined;
|
|
351
379
|
version?: string | undefined;
|
|
352
380
|
modelsConfirmedAt?: string | null | undefined;
|
|
381
|
+
login?: {
|
|
382
|
+
default: "subscription" | "apiKey";
|
|
383
|
+
key: "refused" | "none" | "ready" | "outOfCredit";
|
|
384
|
+
keyStateAt?: string | undefined;
|
|
385
|
+
} | undefined;
|
|
353
386
|
}[];
|
|
354
387
|
workspaces: {
|
|
355
388
|
repositories: string[];
|
|
@@ -377,6 +410,11 @@ export declare const trierarchPluginRouter: import("@trpc/server").TRPCBuiltRout
|
|
|
377
410
|
harness: string;
|
|
378
411
|
reason: string;
|
|
379
412
|
}[] | undefined;
|
|
413
|
+
logins?: {
|
|
414
|
+
shipId: `shp_${string}`;
|
|
415
|
+
login: "subscription" | "apiKey";
|
|
416
|
+
next?: "subscription" | "apiKey" | undefined;
|
|
417
|
+
}[] | undefined;
|
|
380
418
|
load?: {
|
|
381
419
|
memory: {
|
|
382
420
|
totalBytes: number;
|
|
@@ -416,6 +454,7 @@ export declare const trierarchPluginRouter: import("@trpc/server").TRPCBuiltRout
|
|
|
416
454
|
cacheWrite: number;
|
|
417
455
|
};
|
|
418
456
|
estimatedCostUsd: number | null;
|
|
457
|
+
login?: "subscription" | "apiKey" | undefined;
|
|
419
458
|
}[];
|
|
420
459
|
}[];
|
|
421
460
|
} | undefined;
|
package/dist/app.js
CHANGED
|
@@ -35,6 +35,8 @@ import { createWithdrawNetworkRules } from './core/network/withdraw-network-rule
|
|
|
35
35
|
import { createListMachines } from './core/machines/list-machines.js';
|
|
36
36
|
import { createListEnabledModels } from './core/models/list-enabled-models.js';
|
|
37
37
|
import { createSetModelEnabled } from './core/models/set-model-enabled.js';
|
|
38
|
+
import { createKeepUsage } from './core/usage/keep-usage.js';
|
|
39
|
+
import { createPruneUsage } from './core/usage/prune-usage.js';
|
|
38
40
|
import { createReadTokenUsage } from './core/usage/read-token-usage.js';
|
|
39
41
|
import { createReadSubscriptionWindows } from './core/usage/read-subscription-windows.js';
|
|
40
42
|
import { createReadUsageValues } from './core/usage/read-usage-values.js';
|
|
@@ -42,6 +44,8 @@ import { DEFAULT_SILENT_AFTER_MS } from './core/machines/silent.js';
|
|
|
42
44
|
import { createAuthenticateOperator } from './core/operator/authenticate-operator.js';
|
|
43
45
|
/** Between rounds of the plugin's ship taking what waits for it: a ping is answered within about this long. */
|
|
44
46
|
const PING_ROUND_MS = 1000;
|
|
47
|
+
/** Between passes pruning each fleet's usage by its retention (the usage design, "Scale and retention"). */
|
|
48
|
+
const PRUNE_USAGE_INTERVAL_MS = 60 * 60_000;
|
|
45
49
|
export const systemClock = { now: () => new Date() };
|
|
46
50
|
/**
|
|
47
51
|
* The trierarch plugin wired to its own database and to the fleet's public
|
|
@@ -219,10 +223,22 @@ export function createTrierarchPluginApp(options) {
|
|
|
219
223
|
return done;
|
|
220
224
|
};
|
|
221
225
|
let assigning;
|
|
222
|
-
const
|
|
223
|
-
|
|
226
|
+
const keepUsage = createKeepUsage({ usage });
|
|
227
|
+
const answerPings = createAnswerPings({
|
|
228
|
+
connections,
|
|
229
|
+
inbox: door.inbox,
|
|
230
|
+
// A store that fails leaves the delivery unacked, handed again; said here, as the round only counts it.
|
|
231
|
+
keepUsage: (fleetId, delivery) => keepUsage(fleetId, delivery).catch((error) => {
|
|
232
|
+
server.log.error({ err: error, fleet: fleetId, senderShipId: delivery.senderShipId }, "a trierarch's usage could not be kept; the fleet hands it again");
|
|
233
|
+
throw error;
|
|
234
|
+
}),
|
|
235
|
+
});
|
|
236
|
+
/** Answers argo's ping, keeps the trierarchs' usage and acks what else reaches the plugin's ship in each fleet (aeolus-fleet#1113); logged, never thrown. */
|
|
224
237
|
const answerOnce = async () => {
|
|
225
|
-
const { acked, refused } = await answerPings();
|
|
238
|
+
const { acked, notHandled, refused } = await answerPings();
|
|
239
|
+
for (const { delivery, reason } of notHandled) {
|
|
240
|
+
server.log.warn({ contentType: delivery.contentType, senderShipId: delivery.senderShipId, reason }, "the trierarch plugin's ship acked usage it does not handle");
|
|
241
|
+
}
|
|
226
242
|
for (const delivery of acked) {
|
|
227
243
|
const { contentType, senderShipId } = delivery;
|
|
228
244
|
if (resendTrustedRepositories(delivery)) {
|
|
@@ -251,6 +267,29 @@ export function createTrierarchPluginApp(options) {
|
|
|
251
267
|
isAnswering = false;
|
|
252
268
|
});
|
|
253
269
|
}, PING_ROUND_MS);
|
|
270
|
+
const pruneUsage = createPruneUsage({ door, connections, usage, isServed, clock });
|
|
271
|
+
// One pass at a time; a fleet that refused its limits is pruned on the next pass.
|
|
272
|
+
let isPruning = false;
|
|
273
|
+
const pruning = setInterval(() => {
|
|
274
|
+
if (isPruning) {
|
|
275
|
+
return;
|
|
276
|
+
}
|
|
277
|
+
isPruning = true;
|
|
278
|
+
pruneUsage()
|
|
279
|
+
.then((pruned) => {
|
|
280
|
+
for (const { fleetId, outcome } of pruned) {
|
|
281
|
+
if (outcome.kind === 'refused') {
|
|
282
|
+
server.log.warn({ fleet: fleetId, refusal: outcome.refusal }, "reading the fleet's retention refused; its usage is pruned on the next pass");
|
|
283
|
+
}
|
|
284
|
+
}
|
|
285
|
+
})
|
|
286
|
+
.catch((error) => {
|
|
287
|
+
server.log.error({ err: error }, 'pruning usage failed; the next pass tries again');
|
|
288
|
+
})
|
|
289
|
+
.finally(() => {
|
|
290
|
+
isPruning = false;
|
|
291
|
+
});
|
|
292
|
+
}, PRUNE_USAGE_INTERVAL_MS);
|
|
254
293
|
const trpc = {
|
|
255
294
|
prefix: '/trpc',
|
|
256
295
|
trpcOptions: {
|
|
@@ -290,6 +329,7 @@ export function createTrierarchPluginApp(options) {
|
|
|
290
329
|
server.addHook('onClose', async () => {
|
|
291
330
|
clearInterval(assigning);
|
|
292
331
|
clearInterval(answering);
|
|
332
|
+
clearInterval(pruning);
|
|
293
333
|
await prisma.$disconnect();
|
|
294
334
|
});
|
|
295
335
|
return {
|
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,30 @@
|
|
|
1
|
+
import type { KeepUsage } from '../usage/keep-usage.js';
|
|
1
2
|
import type { ConnectionStore, PluginDelivery, PluginInbox } from './ports.js';
|
|
2
|
-
/**
|
|
3
|
+
/**
|
|
4
|
+
* What a round did: pings answered, trierarchs' usage kept, usage not handled
|
|
5
|
+
* and why, other deliveries acked as kept by the fleet, and calls the fleet
|
|
6
|
+
* refused or usage the store failed on, each left to be handed again.
|
|
7
|
+
*/
|
|
3
8
|
export interface PingRound {
|
|
4
9
|
ponged: number;
|
|
5
10
|
acked: PluginDelivery[];
|
|
11
|
+
keptUsage: number;
|
|
12
|
+
notHandled: {
|
|
13
|
+
delivery: PluginDelivery;
|
|
14
|
+
reason: string;
|
|
15
|
+
}[];
|
|
6
16
|
refused: number;
|
|
7
17
|
}
|
|
8
18
|
export type AnswerPings = () => Promise<PingRound>;
|
|
9
19
|
/**
|
|
10
20
|
* Use case: the trierarch plugin's own ship takes what waits for it in each
|
|
11
21
|
* fleet it is connected to, as any crewed ship does (blueprint, "Ping"):
|
|
12
|
-
* argo's ping is answered with pong;
|
|
13
|
-
*
|
|
22
|
+
* argo's ping is answered with pong; a trierarch's usage is kept, then acked,
|
|
23
|
+
* so usage the store fails on is not acked and the fleet hands it again (the
|
|
24
|
+
* usage design); anything else is acked, and the fleet keeps it in its history.
|
|
14
25
|
*/
|
|
15
26
|
export declare function createAnswerPings(deps: {
|
|
16
27
|
connections: ConnectionStore;
|
|
17
28
|
inbox: PluginInbox;
|
|
29
|
+
keepUsage: KeepUsage;
|
|
18
30
|
}): AnswerPings;
|
|
@@ -2,12 +2,13 @@ import { isPingContentType, RECEIVE_MAX_UPPER_BOUND } from '@aeolus-fleet/common
|
|
|
2
2
|
/**
|
|
3
3
|
* Use case: the trierarch plugin's own ship takes what waits for it in each
|
|
4
4
|
* fleet it is connected to, as any crewed ship does (blueprint, "Ping"):
|
|
5
|
-
* argo's ping is answered with pong;
|
|
6
|
-
*
|
|
5
|
+
* argo's ping is answered with pong; a trierarch's usage is kept, then acked,
|
|
6
|
+
* so usage the store fails on is not acked and the fleet hands it again (the
|
|
7
|
+
* usage design); anything else is acked, and the fleet keeps it in its history.
|
|
7
8
|
*/
|
|
8
9
|
export function createAnswerPings(deps) {
|
|
9
10
|
return async () => {
|
|
10
|
-
const round = { ponged: 0, acked: [], refused: 0 };
|
|
11
|
+
const round = { ponged: 0, acked: [], keptUsage: 0, notHandled: [], refused: 0 };
|
|
11
12
|
for (const crew of await deps.connections.connected()) {
|
|
12
13
|
const taken = await deps.inbox.receive(crew.crewToken, RECEIVE_MAX_UPPER_BOUND);
|
|
13
14
|
if (!taken.isOk) {
|
|
@@ -15,13 +16,26 @@ export function createAnswerPings(deps) {
|
|
|
15
16
|
continue;
|
|
16
17
|
}
|
|
17
18
|
for (const delivery of taken.value) {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
if (isPingContentType(delivery.contentType)) {
|
|
20
|
+
const ponged = await deps.inbox.pong(crew.crewToken, delivery.deliveryId);
|
|
21
|
+
round.ponged += ponged.isOk ? 1 : 0;
|
|
22
|
+
round.refused += ponged.isOk ? 0 : 1;
|
|
23
|
+
continue;
|
|
24
|
+
}
|
|
25
|
+
const usage = await deps.keepUsage(crew.fleetId, delivery).catch(() => undefined);
|
|
26
|
+
if (usage === undefined) {
|
|
27
|
+
round.refused += 1;
|
|
28
|
+
continue;
|
|
29
|
+
}
|
|
30
|
+
const acked = await deps.inbox.ack(crew.crewToken, delivery.deliveryId);
|
|
31
|
+
if (!acked.isOk) {
|
|
21
32
|
round.refused += 1;
|
|
22
33
|
}
|
|
23
|
-
else if (
|
|
24
|
-
round.
|
|
34
|
+
else if (usage.kind === 'kept') {
|
|
35
|
+
round.keptUsage += 1;
|
|
36
|
+
}
|
|
37
|
+
else if (usage.kind === 'notHandled') {
|
|
38
|
+
round.notHandled.push({ delivery, reason: usage.reason });
|
|
25
39
|
}
|
|
26
40
|
else {
|
|
27
41
|
round.acked.push(delivery);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"answer-pings.js","sourceRoot":"","sources":["../../../src/core/connection/answer-pings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"answer-pings.js","sourceRoot":"","sources":["../../../src/core/connection/answer-pings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAoBlF;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAgF;IAChH,OAAO,KAAK,IAAI,EAAE;QAChB,MAAM,KAAK,GAAc,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;QAC5F,KAAK,MAAM,IAAI,IAAI,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,CAAC;YACtD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC;YAChF,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBAChB,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;gBACnB,SAAS;YACX,CAAC;YACD,KAAK,MAAM,QAAQ,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBACnC,IAAI,iBAAiB,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;oBAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;oBAC1E,KAAK,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACpC,KAAK,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACrC,SAAS;gBACX,CAAC;gBACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;gBAClF,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxB,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;oBACnB,SAAS;gBACX,CAAC;gBACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;gBACxE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;oBAChB,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;gBACrB,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBACjC,KAAK,CAAC,SAAS,IAAI,CAAC,CAAC;gBACvB,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBACvC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC5D,CAAC;qBAAM,CAAC;oBACN,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC7B,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -113,6 +113,10 @@ export interface FleetDoor {
|
|
|
113
113
|
}): Promise<Result<{
|
|
114
114
|
shipId: ShipId;
|
|
115
115
|
} & IssuedPrompt, FleetRefusal>>;
|
|
116
|
+
/** The days the fleet keeps its finished history, null for kept for good (fleet:read; decision 0066). */
|
|
117
|
+
limits(crewToken: string): Promise<Result<{
|
|
118
|
+
retentionDays: number | null;
|
|
119
|
+
}, FleetRefusal>>;
|
|
116
120
|
/** Every ship of the fleet, retired ones included (fleet:read). */
|
|
117
121
|
listShips(crewToken: string): Promise<Result<ListedShip[], FleetRefusal>>;
|
|
118
122
|
/** Claims a ship's crew request for a trierarch (crew:assign), only while it is unassigned: a lost claim is CONFLICT. */
|
|
@@ -185,6 +189,9 @@ export interface PluginDelivery {
|
|
|
185
189
|
deliveryId: DeliveryId;
|
|
186
190
|
contentType: string;
|
|
187
191
|
senderShipId: ShipId;
|
|
192
|
+
/** The sender's type as the fleet read it, never as the sender says. */
|
|
193
|
+
senderType: string;
|
|
194
|
+
payload: string;
|
|
188
195
|
}
|
|
189
196
|
/** Outbound port: the deliveries to the trierarch plugin's own ship, as its crew takes, acks and pongs them. */
|
|
190
197
|
export interface PluginInbox {
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { type FleetId } from '@aeolus-fleet/common';
|
|
2
|
+
import type { PluginDelivery } from '../connection/ports.js';
|
|
3
|
+
import type { UsageHistory } from './ports.js';
|
|
4
|
+
/** What became of a delivery: not usage, left to the rest of the ship; usage kept; or usage not handled, and why. */
|
|
5
|
+
export type KeptUsage = {
|
|
6
|
+
readonly kind: 'notUsage';
|
|
7
|
+
} | {
|
|
8
|
+
readonly kind: 'kept';
|
|
9
|
+
} | {
|
|
10
|
+
readonly kind: 'notHandled';
|
|
11
|
+
readonly reason: string;
|
|
12
|
+
};
|
|
13
|
+
export type KeepUsage = (fleetId: FleetId, delivery: PluginDelivery) => Promise<KeptUsage>;
|
|
14
|
+
/**
|
|
15
|
+
* Use case: the trierarch plugin keeps the usage a trierarch sends its ship
|
|
16
|
+
* (the usage design, "What the trierarch plugin stores"). Only from a ship of
|
|
17
|
+
* type trierarch, the type the fleet read, and only as common's usage message;
|
|
18
|
+
* anything else is not handled and keeps nothing. The machine is the sender.
|
|
19
|
+
* The usage history keeps the newest reading per hour row, so a delivery
|
|
20
|
+
* handed again keeps the same rows. A store that fails rejects, so the
|
|
21
|
+
* delivery is not acked and is handed again.
|
|
22
|
+
*/
|
|
23
|
+
export declare function createKeepUsage(deps: {
|
|
24
|
+
usage: UsageHistory;
|
|
25
|
+
}): KeepUsage;
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { TRIERARCH_USAGE_CONTENT_TYPE, trierarchUsageMessageSchema } from '@aeolus-fleet/common';
|
|
2
|
+
import { TRIERARCH_TYPE } from '../machines/join-machine.js';
|
|
3
|
+
/** The message's JSON, or undefined when the payload is no JSON. */
|
|
4
|
+
function jsonOf(payload) {
|
|
5
|
+
try {
|
|
6
|
+
return JSON.parse(payload);
|
|
7
|
+
}
|
|
8
|
+
catch {
|
|
9
|
+
return undefined;
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
/** The message as the usage history keeps it: each ship's hour per model, as the sending machine's. */
|
|
13
|
+
function readingOf(machineShipId, message) {
|
|
14
|
+
return {
|
|
15
|
+
machineShipId,
|
|
16
|
+
readAt: new Date(message.readAt),
|
|
17
|
+
hours: message.hours.flatMap(({ hour, ships }) => ships.flatMap(({ shipId, harness, folderMadeAt, login, models }) => models.map(({ model, tokens, estimatedCostUsd }) => ({ hour: new Date(hour), shipId, folderMadeAt: new Date(folderMadeAt), model, harness, login, tokens, estimatedCostUsd })))),
|
|
18
|
+
subscriptions: message.subscriptions.map(({ harness, readAt, windows }) => ({
|
|
19
|
+
harness,
|
|
20
|
+
readAt: new Date(readAt),
|
|
21
|
+
windows: windows.map(({ windowMinutes, usedPercent, resetsAt }) => ({ windowMinutes, usedPercent, resetsAt: new Date(resetsAt) })),
|
|
22
|
+
})),
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* Use case: the trierarch plugin keeps the usage a trierarch sends its ship
|
|
27
|
+
* (the usage design, "What the trierarch plugin stores"). Only from a ship of
|
|
28
|
+
* type trierarch, the type the fleet read, and only as common's usage message;
|
|
29
|
+
* anything else is not handled and keeps nothing. The machine is the sender.
|
|
30
|
+
* The usage history keeps the newest reading per hour row, so a delivery
|
|
31
|
+
* handed again keeps the same rows. A store that fails rejects, so the
|
|
32
|
+
* delivery is not acked and is handed again.
|
|
33
|
+
*/
|
|
34
|
+
export function createKeepUsage(deps) {
|
|
35
|
+
return async (fleetId, delivery) => {
|
|
36
|
+
if (delivery.contentType !== TRIERARCH_USAGE_CONTENT_TYPE) {
|
|
37
|
+
return { kind: 'notUsage' };
|
|
38
|
+
}
|
|
39
|
+
if (delivery.senderType !== TRIERARCH_TYPE) {
|
|
40
|
+
return { kind: 'notHandled', reason: 'its sender is not a trierarch ship' };
|
|
41
|
+
}
|
|
42
|
+
const parsed = trierarchUsageMessageSchema.safeParse(jsonOf(delivery.payload));
|
|
43
|
+
if (!parsed.success) {
|
|
44
|
+
return { kind: 'notHandled', reason: `it is not a usage message: ${parsed.error.message}` };
|
|
45
|
+
}
|
|
46
|
+
await deps.usage.record(fleetId, readingOf(delivery.senderShipId, parsed.data));
|
|
47
|
+
return { kind: 'kept' };
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
//# sourceMappingURL=keep-usage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"keep-usage.js","sourceRoot":"","sources":["../../../src/core/usage/keep-usage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,2BAA2B,EAA4C,MAAM,sBAAsB,CAAC;AAG3I,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAS7D,oEAAoE;AACpE,SAAS,MAAM,CAAC,OAAe;IAC7B,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,uGAAuG;AACvG,SAAS,SAAS,CAAC,aAA6C,EAAE,OAA8B;IAC9F,OAAO;QACL,aAAa;QACb,MAAM,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QAChC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAC/C,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CACjE,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,IAAI,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAC/K,CACF;QACD,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;YAC1E,OAAO;YACP,MAAM,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC;YACxB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,aAAa,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,aAAa,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;SACnI,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,eAAe,CAAC,IAA6B;IAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;QACjC,IAAI,QAAQ,CAAC,WAAW,KAAK,4BAA4B,EAAE,CAAC;YAC1D,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;QAC9B,CAAC;QACD,IAAI,QAAQ,CAAC,UAAU,KAAK,cAAc,EAAE,CAAC;YAC3C,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,oCAAoC,EAAE,CAAC;QAC9E,CAAC;QACD,MAAM,MAAM,GAAG,2BAA2B,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;QAC/E,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,8BAA8B,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;QAC9F,CAAC;QACD,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAChF,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC1B,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -9,10 +9,12 @@ import type { UsageValue, UsageValuesQuery } from './usage-values.js';
|
|
|
9
9
|
* again or arriving late changes nothing; each subscription reading is kept once.
|
|
10
10
|
* Reading token usage adds up, splits, ranks and filters in the store itself,
|
|
11
11
|
* and so does reading a breakdown's values or the subscription windows, a page
|
|
12
|
-
* at a time.
|
|
12
|
+
* at a time. Pruning removes every hour, day and subscription reading wholly
|
|
13
|
+
* before the cutoff, a batch at a time.
|
|
13
14
|
*/
|
|
14
15
|
export interface UsageHistory {
|
|
15
16
|
record(fleetId: FleetId, reading: UsageReading): Promise<void>;
|
|
17
|
+
prune(fleetId: FleetId, before: Date): Promise<void>;
|
|
16
18
|
readTokens(fleetId: FleetId, query: TokenUsageQuery): Promise<TokenUsage>;
|
|
17
19
|
readValues(fleetId: FleetId, query: UsageValuesQuery): Promise<UsageValue[]>;
|
|
18
20
|
readWindows(fleetId: FleetId, query: WindowsQuery): Promise<SubscriptionWindows[]>;
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import type { FleetId } from '@aeolus-fleet/common';
|
|
2
|
+
import type { ConnectionStore, FleetDoor, FleetRefusal } from '../connection/ports.js';
|
|
3
|
+
import type { IsServed } from '../installation/served.js';
|
|
4
|
+
import type { Clock } from '../shared/clock.js';
|
|
5
|
+
import type { UsageHistory } from './ports.js';
|
|
6
|
+
/** What a pass did with a fleet's usage: pruned before a cutoff, kept for good, or left as it was because the fleet refused its limits. */
|
|
7
|
+
export type PruneOutcome = {
|
|
8
|
+
readonly kind: 'pruned';
|
|
9
|
+
readonly before: Date;
|
|
10
|
+
} | {
|
|
11
|
+
readonly kind: 'keptForGood';
|
|
12
|
+
} | {
|
|
13
|
+
readonly kind: 'refused';
|
|
14
|
+
readonly refusal: FleetRefusal;
|
|
15
|
+
};
|
|
16
|
+
export type PruneUsage = () => Promise<{
|
|
17
|
+
fleetId: FleetId;
|
|
18
|
+
outcome: PruneOutcome;
|
|
19
|
+
}[]>;
|
|
20
|
+
/**
|
|
21
|
+
* Use case: the trierarch plugin prunes each fleet's usage by the fleet's
|
|
22
|
+
* retention (the usage design, "Scale and retention"; decision 0066). Per
|
|
23
|
+
* connected fleet it serves, it reads the days fleet.limits answers its ship
|
|
24
|
+
* and prunes the usage wholly older than that many days; a fleet that keeps
|
|
25
|
+
* its history for good keeps all of it. A fleet switched off is not pruned.
|
|
26
|
+
*/
|
|
27
|
+
export declare function createPruneUsage(deps: {
|
|
28
|
+
door: FleetDoor;
|
|
29
|
+
connections: ConnectionStore;
|
|
30
|
+
usage: UsageHistory;
|
|
31
|
+
isServed: IsServed;
|
|
32
|
+
clock: Clock;
|
|
33
|
+
}): PruneUsage;
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
const DAY_MS = 24 * 60 * 60_000;
|
|
2
|
+
/**
|
|
3
|
+
* Use case: the trierarch plugin prunes each fleet's usage by the fleet's
|
|
4
|
+
* retention (the usage design, "Scale and retention"; decision 0066). Per
|
|
5
|
+
* connected fleet it serves, it reads the days fleet.limits answers its ship
|
|
6
|
+
* and prunes the usage wholly older than that many days; a fleet that keeps
|
|
7
|
+
* its history for good keeps all of it. A fleet switched off is not pruned.
|
|
8
|
+
*/
|
|
9
|
+
export function createPruneUsage(deps) {
|
|
10
|
+
return async () => {
|
|
11
|
+
const pruned = [];
|
|
12
|
+
for (const crew of await deps.connections.connected()) {
|
|
13
|
+
if (!(await deps.isServed(crew.fleetId))) {
|
|
14
|
+
continue;
|
|
15
|
+
}
|
|
16
|
+
const limits = await deps.door.limits(crew.crewToken);
|
|
17
|
+
if (!limits.isOk) {
|
|
18
|
+
pruned.push({ fleetId: crew.fleetId, outcome: { kind: 'refused', refusal: limits.error } });
|
|
19
|
+
continue;
|
|
20
|
+
}
|
|
21
|
+
const { retentionDays } = limits.value;
|
|
22
|
+
if (retentionDays === null) {
|
|
23
|
+
pruned.push({ fleetId: crew.fleetId, outcome: { kind: 'keptForGood' } });
|
|
24
|
+
continue;
|
|
25
|
+
}
|
|
26
|
+
const before = new Date(deps.clock.now().getTime() - retentionDays * DAY_MS);
|
|
27
|
+
await deps.usage.prune(crew.fleetId, before);
|
|
28
|
+
pruned.push({ fleetId: crew.fleetId, outcome: { kind: 'pruned', before } });
|
|
29
|
+
}
|
|
30
|
+
return pruned;
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
//# sourceMappingURL=prune-usage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prune-usage.js","sourceRoot":"","sources":["../../../src/core/usage/prune-usage.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,GAAG,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;AAOhC;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAA8G;IAC7I,OAAO,KAAK,IAAI,EAAE;QAChB,MAAM,MAAM,GAAkD,EAAE,CAAC;QACjE,KAAK,MAAM,IAAI,IAAI,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,CAAC;YACtD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;gBACzC,SAAS;YACX,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACtD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBACjB,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC5F,SAAS;YACX,CAAC;YACD,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC;YACvC,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;gBAC3B,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;gBACzE,SAAS;YACX,CAAC;YACD,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,aAAa,GAAG,MAAM,CAAC,CAAC;YAC7E,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC7C,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QAC9E,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aeolus-fleet/trierarch-plugin",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.36.0",
|
|
4
4
|
"description": "Brings your machines into an Aeolus fleet and places crew requests on them.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"aeolus",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"postpack": "rm LICENSE"
|
|
50
50
|
},
|
|
51
51
|
"dependencies": {
|
|
52
|
-
"@aeolus-fleet/common": "^0.
|
|
52
|
+
"@aeolus-fleet/common": "^0.34.0",
|
|
53
53
|
"@prisma/adapter-pg": "^7.10.0",
|
|
54
54
|
"@prisma/client": "^7.10.0",
|
|
55
55
|
"@trpc/server": "^11.19.0",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"zod": "^4.6.5"
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
|
-
"@aeolus-fleet/core": "^0.
|
|
61
|
+
"@aeolus-fleet/core": "^0.34.0",
|
|
62
62
|
"@testcontainers/postgresql": "^12.2.0"
|
|
63
63
|
}
|
|
64
64
|
}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
-- The Usage page's read (the usage design, "What the trierarch plugin stores"): a range is one index range scan of the fleet's
|
|
2
|
+
-- hours or days, every column the read takes included, so it reads no table pages. Written by hand: Prisma's schema cannot say INCLUDE.
|
|
3
|
+
CREATE INDEX "usage_hours_fleet_id_hour_read_idx" ON "usage_hours" ("fleet_id", "hour")
|
|
4
|
+
INCLUDE ("machine_ship_id", "ship_id", "model", "harness", "login", "input", "output", "cache_read", "cache_write",
|
|
5
|
+
"estimated_cost_input_usd", "estimated_cost_output_usd", "estimated_cost_cache_read_usd", "estimated_cost_cache_write_usd");
|
|
6
|
+
|
|
7
|
+
CREATE INDEX "usage_days_fleet_id_day_read_idx" ON "usage_days" ("fleet_id", "day")
|
|
8
|
+
INCLUDE ("machine_ship_id", "ship_id", "model", "harness", "login", "input", "output", "cache_read", "cache_write",
|
|
9
|
+
"estimated_cost_input_usd", "estimated_cost_output_usd", "estimated_cost_cache_read_usd", "estimated_cost_cache_write_usd",
|
|
10
|
+
"unpriced_input", "unpriced_output", "unpriced_cache_read", "unpriced_cache_write");
|