@aeolus-fleet/core 0.41.0 → 0.43.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/http/plugin-calls.d.ts +14 -0
- package/dist/adapters/http/plugin-calls.js +46 -0
- package/dist/adapters/http/plugin-calls.js.map +1 -0
- package/dist/adapters/http/plugin-targets.d.ts +8 -0
- package/dist/adapters/http/plugin-targets.js +27 -0
- package/dist/adapters/http/plugin-targets.js.map +1 -0
- package/dist/adapters/prisma/event-log.d.ts +2 -1
- package/dist/adapters/prisma/event-log.js +7 -2
- package/dist/adapters/prisma/event-log.js.map +1 -1
- package/dist/adapters/prisma/fleet-journeys.d.ts +49 -0
- package/dist/adapters/prisma/fleet-journeys.js +112 -0
- package/dist/adapters/prisma/fleet-journeys.js.map +1 -0
- package/dist/adapters/prisma/generated/browser.d.ts +17 -1
- package/dist/adapters/prisma/generated/client.d.ts +19 -3
- package/dist/adapters/prisma/generated/client.js +2 -2
- package/dist/adapters/prisma/generated/commonInputTypes.d.ts +236 -214
- package/dist/adapters/prisma/generated/internal/class.d.ts +40 -7
- package/dist/adapters/prisma/generated/internal/class.js +4 -4
- package/dist/adapters/prisma/generated/internal/class.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.d.ts +266 -16
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js +26 -4
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +30 -5
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +26 -4
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
- package/dist/adapters/prisma/generated/models/Delivery.d.ts +146 -9
- package/dist/adapters/prisma/generated/models/Fleet.d.ts +513 -29
- package/dist/adapters/prisma/generated/models/FleetJourney.d.ts +1212 -0
- package/dist/adapters/prisma/generated/models/FleetJourney.js +2 -0
- package/dist/adapters/prisma/generated/models/FleetJourney.js.map +1 -0
- package/dist/adapters/prisma/generated/models/InstallationJourneyChange.d.ts +982 -0
- package/dist/adapters/prisma/generated/models/InstallationJourneyChange.js +2 -0
- package/dist/adapters/prisma/generated/models/InstallationJourneyChange.js.map +1 -0
- package/dist/adapters/prisma/generated/models/InstallationJourneyClock.d.ts +964 -0
- package/dist/adapters/prisma/generated/models/InstallationJourneyClock.js +2 -0
- package/dist/adapters/prisma/generated/models/InstallationJourneyClock.js.map +1 -0
- package/dist/adapters/prisma/generated/models.d.ts +3 -0
- package/dist/adapters/prisma/installation.js +8 -1
- package/dist/adapters/prisma/installation.js.map +1 -1
- package/dist/adapters/prisma/journey-source-facts.d.ts +7 -0
- package/dist/adapters/prisma/journey-source-facts.js +76 -0
- package/dist/adapters/prisma/journey-source-facts.js.map +1 -0
- package/dist/adapters/prisma/registry.js +2 -0
- package/dist/adapters/prisma/registry.js.map +1 -1
- package/dist/adapters/prisma/unit-of-work.d.ts +7 -4
- package/dist/adapters/prisma/unit-of-work.js +13 -10
- package/dist/adapters/prisma/unit-of-work.js.map +1 -1
- package/dist/adapters/trpc/console.d.ts +1 -1
- package/dist/adapters/trpc/context.d.ts +4 -0
- package/dist/adapters/trpc/fleet.d.ts +29 -20
- package/dist/adapters/trpc/fleet.js +16 -1
- package/dist/adapters/trpc/fleet.js.map +1 -1
- package/dist/adapters/trpc/installation.d.ts +120 -0
- package/dist/adapters/trpc/installation.js +34 -1
- package/dist/adapters/trpc/installation.js.map +1 -1
- package/dist/adapters/trpc/router.d.ts +155 -28
- package/dist/adapters/trpc/ship-contract.js +1 -0
- package/dist/adapters/trpc/ship-contract.js.map +1 -1
- package/dist/adapters/trpc/ship.d.ts +7 -7
- package/dist/adapters/trpc/trpc.d.ts +9 -0
- package/dist/adapters/trpc/trpc.js +13 -1
- package/dist/adapters/trpc/trpc.js.map +1 -1
- package/dist/app.d.ts +2 -0
- package/dist/app.js +2 -0
- package/dist/app.js.map +1 -1
- package/dist/config.d.ts +2 -0
- package/dist/config.js +11 -0
- package/dist/config.js.map +1 -1
- package/dist/domain/identity/authenticate-installation.d.ts +3 -1
- package/dist/domain/identity/authenticate-installation.js +4 -2
- package/dist/domain/identity/authenticate-installation.js.map +1 -1
- package/dist/domain/messaging/journey-message.d.ts +18 -0
- package/dist/domain/messaging/journey-message.js +10 -0
- package/dist/domain/messaging/journey-message.js.map +1 -0
- package/dist/domain/messaging/public.d.ts +1 -0
- package/dist/domain/messaging/public.js +1 -0
- package/dist/domain/messaging/public.js.map +1 -1
- package/dist/domain/registry/call-plugin.d.ts +26 -0
- package/dist/domain/registry/call-plugin.js +46 -0
- package/dist/domain/registry/call-plugin.js.map +1 -0
- package/dist/domain/registry/installation-fleet.d.ts +2 -1
- package/dist/domain/registry/installation-fleet.js.map +1 -1
- package/dist/domain/registry/plugin-calls.d.ts +11 -0
- package/dist/domain/registry/plugin-calls.js +2 -0
- package/dist/domain/registry/plugin-calls.js.map +1 -0
- package/dist/domain/registry/ports.d.ts +2 -1
- package/dist/domain/registry/read-installation-journeys.d.ts +90 -0
- package/dist/domain/registry/read-installation-journeys.js +20 -0
- package/dist/domain/registry/read-installation-journeys.js.map +1 -0
- package/dist/domain/shared/caller.d.ts +4 -0
- package/dist/domain/shared/caller.js +4 -0
- package/dist/domain/shared/caller.js.map +1 -1
- package/dist/domain/shared/expire-journey-activity.d.ts +18 -0
- package/dist/domain/shared/expire-journey-activity.js +17 -0
- package/dist/domain/shared/expire-journey-activity.js.map +1 -0
- package/dist/domain/shared/fleet-journey.d.ts +35 -0
- package/dist/domain/shared/fleet-journey.js +83 -0
- package/dist/domain/shared/fleet-journey.js.map +1 -0
- package/dist/domain/shared/record-fleet-journey.d.ts +17 -0
- package/dist/domain/shared/record-fleet-journey.js +8 -0
- package/dist/domain/shared/record-fleet-journey.js.map +1 -0
- package/dist/maintenance-pass.d.ts +1 -1
- package/dist/maintenance-pass.js +1 -0
- package/dist/maintenance-pass.js.map +1 -1
- package/dist/start.js +1 -0
- package/dist/start.js.map +1 -1
- package/dist/wiring.d.ts +9 -0
- package/dist/wiring.js +16 -3
- package/dist/wiring.js.map +1 -1
- package/package.json +2 -2
- package/src/adapters/prisma/migrations/20261117010000_fleet_journeys/migration.sql +37 -0
- package/src/adapters/prisma/schema.prisma +54 -19
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { PluginCalls } from '../../domain/registry/plugin-calls.js';
|
|
2
|
+
import type { PluginTarget } from './plugin-targets.js';
|
|
3
|
+
export interface PluginDispatchLog {
|
|
4
|
+
requestId: string;
|
|
5
|
+
pluginShipId: string;
|
|
6
|
+
procedure: string;
|
|
7
|
+
durationMs: number;
|
|
8
|
+
outcome: string;
|
|
9
|
+
}
|
|
10
|
+
export declare function createHttpPluginCalls(options: {
|
|
11
|
+
targets: readonly PluginTarget[];
|
|
12
|
+
now: () => Date;
|
|
13
|
+
log?: (facts: PluginDispatchLog) => void;
|
|
14
|
+
}): PluginCalls;
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
/** One synchronous server-authenticated dispatch. Never follow redirects or retry a plugin operation. */
|
|
2
|
+
import { pluginCallAnswerSchema } from '@aeolus-fleet/common';
|
|
3
|
+
import { err } from '../../domain/shared/result.js';
|
|
4
|
+
function refused(code, message) {
|
|
5
|
+
return err({ kind: 'PLUGIN_REFUSED', code, message });
|
|
6
|
+
}
|
|
7
|
+
export function createHttpPluginCalls(options) {
|
|
8
|
+
const dispatch = async (context) => {
|
|
9
|
+
const target = options.targets.find((candidate) => candidate.fleetId === context.fleetId && candidate.pluginShipId === context.pluginShipId);
|
|
10
|
+
if (!target)
|
|
11
|
+
return refused('NOT_FOUND', 'Plugin endpoint is not configured; no operation started');
|
|
12
|
+
const remaining = Date.parse(context.expiresAt) - options.now().getTime();
|
|
13
|
+
if (remaining <= 0)
|
|
14
|
+
return refused('TIMEOUT', 'Plugin dispatch expired; no operation started');
|
|
15
|
+
const unknown = `Plugin outcome unknown; read current state before retrying (request ${context.requestId})`;
|
|
16
|
+
try {
|
|
17
|
+
const response = await fetch(target.url, { method: 'POST', redirect: 'manual', headers: { 'content-type': 'application/json', 'aeolus-plugin-secret': target.secret }, body: JSON.stringify(context), signal: AbortSignal.timeout(remaining) });
|
|
18
|
+
if (response.status >= 300 && response.status < 400)
|
|
19
|
+
return refused('BAD_GATEWAY', unknown);
|
|
20
|
+
const body = await response.json();
|
|
21
|
+
const answer = pluginCallAnswerSchema.safeParse(body);
|
|
22
|
+
if (!answer.success)
|
|
23
|
+
return refused('BAD_GATEWAY', unknown);
|
|
24
|
+
if ('error' in answer.data) {
|
|
25
|
+
const { code } = answer.data.error.data;
|
|
26
|
+
return refused(code, code === 'BAD_GATEWAY' || code === 'TIMEOUT' || code === 'INTERNAL_SERVER_ERROR' ? unknown : `Plugin operation refused: ${code} (request ${context.requestId})`);
|
|
27
|
+
}
|
|
28
|
+
if (!response.ok)
|
|
29
|
+
return refused('BAD_GATEWAY', unknown);
|
|
30
|
+
return { isOk: true, value: answer.data.result.data };
|
|
31
|
+
}
|
|
32
|
+
catch (error) {
|
|
33
|
+
if (error instanceof Error && 'cause' in error && error.cause instanceof Error && 'code' in error.cause && error.cause.code === 'ECONNREFUSED') {
|
|
34
|
+
return refused('BAD_GATEWAY', `Plugin unavailable; no operation started (request ${context.requestId})`);
|
|
35
|
+
}
|
|
36
|
+
return refused(error instanceof Error && (error.name === 'TimeoutError' || error.name === 'AbortError') ? 'TIMEOUT' : 'BAD_GATEWAY', unknown);
|
|
37
|
+
}
|
|
38
|
+
};
|
|
39
|
+
return { dispatch: async (context) => {
|
|
40
|
+
const startedAt = performance.now();
|
|
41
|
+
const answer = await dispatch(context);
|
|
42
|
+
options.log?.({ requestId: context.requestId, pluginShipId: context.pluginShipId, procedure: context.procedure, durationMs: performance.now() - startedAt, outcome: answer.isOk ? 'OK' : answer.error.code });
|
|
43
|
+
return answer;
|
|
44
|
+
} };
|
|
45
|
+
}
|
|
46
|
+
//# sourceMappingURL=plugin-calls.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plugin-calls.js","sourceRoot":"","sources":["../../../src/adapters/http/plugin-calls.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
export declare const pluginTargetsSchema: z.ZodArray<z.ZodObject<{
|
|
3
|
+
fleetId: z.ZodType<`flt_${string}`, unknown, z.core.$ZodTypeInternals<`flt_${string}`, unknown>>;
|
|
4
|
+
pluginShipId: z.ZodType<`shp_${string}`, unknown, z.core.$ZodTypeInternals<`shp_${string}`, unknown>>;
|
|
5
|
+
url: z.ZodString;
|
|
6
|
+
secret: z.ZodString;
|
|
7
|
+
}, z.core.$strict>>;
|
|
8
|
+
export type PluginTarget = z.infer<typeof pluginTargetsSchema>[number];
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/** Deployment settings only: endpoints and shared secrets never live in a fleet or actor input. */
|
|
2
|
+
import { idSchema } from '@aeolus-fleet/common';
|
|
3
|
+
import { z } from 'zod';
|
|
4
|
+
/** Plain HTTP is restricted to literal loopback/private addresses, so DNS cannot turn it public. */
|
|
5
|
+
function isAllowedEndpoint(value) {
|
|
6
|
+
const url = URL.parse(value);
|
|
7
|
+
if (url?.username !== '' || url.password !== '' || url.hash !== '' || url.search !== '')
|
|
8
|
+
return false;
|
|
9
|
+
if (url.protocol === 'https:')
|
|
10
|
+
return true;
|
|
11
|
+
if (url.protocol !== 'http:')
|
|
12
|
+
return false;
|
|
13
|
+
const host = url.hostname;
|
|
14
|
+
if (host === '[::1]' || host === 'localhost')
|
|
15
|
+
return true;
|
|
16
|
+
const octets = host.split('.').map(Number);
|
|
17
|
+
if (octets.length !== 4 || octets.some((part) => !Number.isInteger(part) || part < 0 || part > 255))
|
|
18
|
+
return false;
|
|
19
|
+
const [first, second = 0] = octets;
|
|
20
|
+
return first === 127 || first === 10 || (first === 172 && second >= 16 && second <= 31) || (first === 192 && second === 168);
|
|
21
|
+
}
|
|
22
|
+
export const pluginTargetsSchema = z.array(z.strictObject({
|
|
23
|
+
fleetId: idSchema('fleet'), pluginShipId: idSchema('ship'),
|
|
24
|
+
url: z.string().refine(isAllowedEndpoint, 'must be HTTPS or HTTP on a private literal address'),
|
|
25
|
+
secret: z.string().min(32),
|
|
26
|
+
})).refine((targets) => new Set(targets.map((target) => `${target.fleetId}:${target.pluginShipId}`)).size === targets.length, 'duplicate plugin target');
|
|
27
|
+
//# sourceMappingURL=plugin-targets.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"plugin-targets.js","sourceRoot":"","sources":["../../../src/adapters/http/plugin-targets.ts"],"names":[],"mappings":"AAAA,mGAAmG;AACnG,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,oGAAoG;AACpG,SAAS,iBAAiB,CAAC,KAAa;IACtC,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC7B,IAAI,GAAG,EAAE,QAAQ,KAAK,EAAE,IAAI,GAAG,CAAC,QAAQ,KAAK,EAAE,IAAI,GAAG,CAAC,IAAI,KAAK,EAAE,IAAI,GAAG,CAAC,MAAM,KAAK,EAAE;QAAE,OAAO,KAAK,CAAC;IACtG,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC3C,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO;QAAE,OAAO,KAAK,CAAC;IAC3C,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC;IAC1B,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,WAAW;QAAE,OAAO,IAAI,CAAC;IAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IAClH,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC;IACnC,OAAO,KAAK,KAAK,GAAG,IAAI,KAAK,KAAK,EAAE,IAAI,CAAC,KAAK,KAAK,GAAG,IAAI,MAAM,IAAI,EAAE,IAAI,MAAM,IAAI,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,CAAC,CAAC;AAC/H,CAAC;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC;IACxD,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC;IAC1D,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,iBAAiB,EAAE,oDAAoD,CAAC;IAC/F,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;CAC3B,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { Clock } from '../../domain/shared/clock.js';
|
|
1
2
|
import type { EventLog, FleetEventFeed } from '../../domain/shared/events.js';
|
|
2
3
|
import type { Db } from './client.js';
|
|
3
4
|
/** The one channel every committed event is announced on, with its fleet and the last number. */
|
|
@@ -6,6 +7,6 @@ export interface BufferedEventLog extends EventLog {
|
|
|
6
7
|
/** Numbers and writes the held events and announces them. The unit of work's last step before commit. */
|
|
7
8
|
flush(): Promise<void>;
|
|
8
9
|
}
|
|
9
|
-
export declare function createPrismaEventLog(db: Db): BufferedEventLog;
|
|
10
|
+
export declare function createPrismaEventLog(db: Db, clock?: Clock): BufferedEventLog;
|
|
10
11
|
/** Reads committed events by number. Each read is one statement, outside a unit of work. */
|
|
11
12
|
export declare function createPrismaFleetEventFeed(db: Db): FleetEventFeed;
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { projectJourneyEvents } from './fleet-journeys.js';
|
|
1
2
|
import { toLastEventSeq, toSequencedEvent } from './rows.js';
|
|
2
3
|
/** The one channel every committed event is announced on, with its fleet and the last number. */
|
|
3
4
|
export const FLEET_EVENT_CHANNEL = 'aeolus_event';
|
|
4
|
-
export function createPrismaEventLog(db) {
|
|
5
|
+
export function createPrismaEventLog(db, clock = { now: () => new Date() }) {
|
|
5
6
|
const held = [];
|
|
6
7
|
return {
|
|
7
8
|
append: (event) => {
|
|
@@ -10,8 +11,11 @@ export function createPrismaEventLog(db) {
|
|
|
10
11
|
},
|
|
11
12
|
flush: async () => {
|
|
12
13
|
const fleets = [...new Set(held.map((event) => event.fleetId))].toSorted();
|
|
14
|
+
if (fleets.length > 1) {
|
|
15
|
+
await db.$queryRaw `SELECT id FROM fleets WHERE id = ANY(${fleets}::text[]) ORDER BY id FOR UPDATE`;
|
|
16
|
+
}
|
|
13
17
|
for (const fleetId of fleets) {
|
|
14
|
-
await writeNumbered(db, { fleetId, events: held.filter((event) => event.fleetId === fleetId) });
|
|
18
|
+
await writeNumbered(db, { fleetId, events: held.filter((event) => event.fleetId === fleetId), computedAt: clock.now().toISOString() });
|
|
15
19
|
}
|
|
16
20
|
held.length = 0;
|
|
17
21
|
},
|
|
@@ -39,6 +43,7 @@ async function writeNumbered(db, of) {
|
|
|
39
43
|
seq: BigInt(firstSeq + index),
|
|
40
44
|
})),
|
|
41
45
|
});
|
|
46
|
+
await projectJourneyEvents(db, { fleetId, events, lastSeq, computedAt: of.computedAt });
|
|
42
47
|
await db.$executeRaw `SELECT pg_notify(${FLEET_EVENT_CHANNEL}, ${JSON.stringify({ fleetId, seq: lastSeq })})`;
|
|
43
48
|
}
|
|
44
49
|
/** Reads committed events by number. Each read is one statement, outside a unit of work. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event-log.js","sourceRoot":"","sources":["../../../src/adapters/prisma/event-log.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"event-log.js","sourceRoot":"","sources":["../../../src/adapters/prisma/event-log.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { type FleetId } from '@aeolus-fleet/common';
|
|
2
|
+
import type { JourneyActivityExpiry } from '../../domain/shared/expire-journey-activity.js';
|
|
3
|
+
import type { JourneyRecords } from '../../domain/shared/record-fleet-journey.js';
|
|
4
|
+
import type { FleetEvent } from '../../domain/shared/events.js';
|
|
5
|
+
import type { InstallationJourneyReads, JourneyPagePosition } from '../../domain/registry/read-installation-journeys.js';
|
|
6
|
+
import type { Db } from './client.js';
|
|
7
|
+
import { Prisma } from './generated/client.js';
|
|
8
|
+
export declare function createPrismaJourneyRecords(db: Db): JourneyRecords;
|
|
9
|
+
/** Called after the source fleet row is locked, before commit. No background consumer can lose evidence to pruning. */
|
|
10
|
+
export declare function projectJourneyEvents(db: Db, input: {
|
|
11
|
+
fleetId: FleetId;
|
|
12
|
+
events: readonly FleetEvent[];
|
|
13
|
+
lastSeq: number;
|
|
14
|
+
computedAt: string;
|
|
15
|
+
}): Promise<void>;
|
|
16
|
+
export declare function deleteFleetJourney(db: Db, fleetId: FleetId): Promise<void>;
|
|
17
|
+
/** Keyset reads are bounded before any projection JSON is loaded. */
|
|
18
|
+
export declare function journeyPageStatement(position?: JourneyPagePosition): Prisma.Sql;
|
|
19
|
+
export declare function journeyChangesStatement(after: bigint): Prisma.Sql;
|
|
20
|
+
export declare function createPrismaInstallationJourneyReads(db: Db): InstallationJourneyReads;
|
|
21
|
+
/** Kept outside the legacy unbounded list: only one fleet and the new bounded resources carry journeys. */
|
|
22
|
+
export declare function readFleetJourney(db: Db, input: {
|
|
23
|
+
fleetId: FleetId;
|
|
24
|
+
now: Date;
|
|
25
|
+
}): Promise<{
|
|
26
|
+
milestones: {
|
|
27
|
+
key: "fleet-ready" | "first-ship-crewed" | "two-ships-crewed" | "first-message" | "first-value" | "repeat-value";
|
|
28
|
+
label: string;
|
|
29
|
+
definitionVersion: string;
|
|
30
|
+
occurredAt: string | null;
|
|
31
|
+
computedAt: string;
|
|
32
|
+
coverageFrom: string;
|
|
33
|
+
state: "unknown" | "reached" | "not-yet";
|
|
34
|
+
}[];
|
|
35
|
+
firstValueDefinition: {
|
|
36
|
+
label: "First value";
|
|
37
|
+
version: "round-trip-v1";
|
|
38
|
+
definition: string;
|
|
39
|
+
};
|
|
40
|
+
computedAt: string;
|
|
41
|
+
coverageFrom: string;
|
|
42
|
+
processedThrough: number;
|
|
43
|
+
activityDates: string[];
|
|
44
|
+
activityDatesLast7Days: string[];
|
|
45
|
+
activityDatesLast28Days: string[];
|
|
46
|
+
latestQualifyingActivityAt: string | null;
|
|
47
|
+
} | undefined>;
|
|
48
|
+
/** Expiry reads only due compact projections, with concurrent maintenance workers skipping held rows. */
|
|
49
|
+
export declare function createPrismaJourneyActivityExpiry(db: Db): JourneyActivityExpiry;
|
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
/** Durable compact projections and a commit-ordered installation change cursor. */
|
|
2
|
+
import { isDeepStrictEqual } from 'node:util';
|
|
3
|
+
import { fleetJourneySummarySchema, idSchema } from '@aeolus-fleet/common';
|
|
4
|
+
import { z } from 'zod';
|
|
5
|
+
import { JOURNEY_ACTIVITY_DAYS, newFleetJourney, fleetJourneySummary, projectFleetJourney } from '../../domain/shared/fleet-journey.js';
|
|
6
|
+
import { Prisma } from './generated/client.js';
|
|
7
|
+
import { journeySourceFacts } from './journey-source-facts.js';
|
|
8
|
+
const privateJourney = fleetJourneySummarySchema.omit({ activityDatesLast7Days: true, activityDatesLast28Days: true }).extend({ crewedShipIds: z.array(idSchema('ship')).max(2) });
|
|
9
|
+
const projectionRow = z.object({ fleetId: idSchema('fleet'), createdAt: z.date(), coverageFrom: z.date(), processedThrough: z.bigint(), data: z.unknown() });
|
|
10
|
+
function journeyOf(row) {
|
|
11
|
+
return row.data === null
|
|
12
|
+
? { ...newFleetJourney({ createdAt: row.createdAt.toISOString(), coverageFrom: row.coverageFrom.toISOString(), computedAt: row.coverageFrom.toISOString() }), processedThrough: Number(row.processedThrough) }
|
|
13
|
+
: privateJourney.parse(row.data);
|
|
14
|
+
}
|
|
15
|
+
export function createPrismaJourneyRecords(db) {
|
|
16
|
+
return {
|
|
17
|
+
read: async (fleetId) => {
|
|
18
|
+
const [row] = z.array(projectionRow).parse(await db.$queryRaw `SELECT fleet_id AS "fleetId", created_at AS "createdAt", coverage_from AS "coverageFrom", processed_through AS "processedThrough", data FROM fleet_journeys WHERE fleet_id = ${fleetId}`);
|
|
19
|
+
return row ? journeyOf(row) : undefined;
|
|
20
|
+
},
|
|
21
|
+
save: async (fleetId, journey) => {
|
|
22
|
+
const firstDate = journey.activityDates[0];
|
|
23
|
+
const expiresAt = firstDate ? new Date(Date.parse(`${firstDate}T00:00:00.000Z`) + JOURNEY_ACTIVITY_DAYS * 86_400_000) : null;
|
|
24
|
+
await db.$executeRaw `UPDATE fleet_journeys SET data = ${JSON.stringify(journey)}::jsonb, processed_through = ${journey.processedThrough}, activity_expires_at = ${expiresAt} WHERE fleet_id = ${fleetId}`;
|
|
25
|
+
},
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
/** Called after the source fleet row is locked, before commit. No background consumer can lose evidence to pruning. */
|
|
29
|
+
export async function projectJourneyEvents(db, input) {
|
|
30
|
+
const { fleetId, events, lastSeq } = input;
|
|
31
|
+
const created = events.find((event) => event.type === 'FleetInitialised');
|
|
32
|
+
if (created) {
|
|
33
|
+
await db.$executeRaw `INSERT INTO fleet_journeys(fleet_id, created_at, coverage_from) VALUES (${fleetId}, ${created.occurredAt}, ${created.occurredAt}) ON CONFLICT DO NOTHING`;
|
|
34
|
+
}
|
|
35
|
+
if (!events.some((event) => ['FleetInitialised', 'ShipClaimed', 'MessageAccepted', 'DeliveryReceived', 'DeliveryHanded'].includes(event.type))) {
|
|
36
|
+
await db.$executeRaw `UPDATE fleet_journeys SET processed_through = ${lastSeq},
|
|
37
|
+
data = data || jsonb_build_object('processedThrough', ${lastSeq}::bigint, 'computedAt', ${input.computedAt}::text)
|
|
38
|
+
WHERE fleet_id = ${fleetId}`;
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
const [row] = z.array(projectionRow).parse(await db.$queryRaw `SELECT fleet_id AS "fleetId", created_at AS "createdAt", coverage_from AS "coverageFrom", processed_through AS "processedThrough", data FROM fleet_journeys WHERE fleet_id = ${fleetId}`);
|
|
42
|
+
if (!row)
|
|
43
|
+
return;
|
|
44
|
+
const state = journeyOf(row);
|
|
45
|
+
const facts = await journeySourceFacts(db, events);
|
|
46
|
+
const journey = projectFleetJourney(state, { facts, computedAt: input.computedAt, processedThrough: lastSeq });
|
|
47
|
+
await createPrismaJourneyRecords(db).save(fleetId, journey);
|
|
48
|
+
// Watermarks stay fleet-local. The installation cursor only advertises changed facts.
|
|
49
|
+
if (created || !isDeepStrictEqual(journeyFacts(state), journeyFacts(journey))) {
|
|
50
|
+
await recordJourneyChange(db, { fleetId, isDeleted: false });
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
function journeyFacts(journey) {
|
|
54
|
+
return { milestones: journey.milestones, crewedShipIds: journey.crewedShipIds,
|
|
55
|
+
activityDates: journey.activityDates, latestQualifyingActivityAt: journey.latestQualifyingActivityAt };
|
|
56
|
+
}
|
|
57
|
+
/** The single installation clock is locked last. Lower cursors always commit before higher ones. */
|
|
58
|
+
async function recordJourneyChange(db, input) {
|
|
59
|
+
const [clock] = z.array(z.object({ seq: z.bigint() })).parse(await db.$queryRaw `UPDATE installation_journey_clock SET seq = seq + 1 WHERE id = 1 RETURNING seq`);
|
|
60
|
+
if (!clock)
|
|
61
|
+
throw new Error('The installation journey clock is missing');
|
|
62
|
+
await db.$executeRaw `INSERT INTO installation_journey_changes(resource_id, seq, is_deleted) VALUES (${input.fleetId}, ${clock.seq}, ${input.isDeleted})
|
|
63
|
+
ON CONFLICT (resource_id) DO UPDATE SET seq = EXCLUDED.seq, is_deleted = EXCLUDED.is_deleted`;
|
|
64
|
+
}
|
|
65
|
+
export async function deleteFleetJourney(db, fleetId) {
|
|
66
|
+
await db.$executeRaw `DELETE FROM fleet_journeys WHERE fleet_id = ${fleetId}`;
|
|
67
|
+
await recordJourneyChange(db, { fleetId, isDeleted: true });
|
|
68
|
+
}
|
|
69
|
+
/** Keyset reads are bounded before any projection JSON is loaded. */
|
|
70
|
+
export function journeyPageStatement(position) {
|
|
71
|
+
const after = position ? Prisma.sql `WHERE (created_at, fleet_id) > (${position.createdAt}, ${position.fleetId})` : Prisma.empty;
|
|
72
|
+
return Prisma.sql `SELECT fleet_id AS "fleetId", created_at AS "createdAt", coverage_from AS "coverageFrom", processed_through AS "processedThrough", data
|
|
73
|
+
FROM fleet_journeys ${after} ORDER BY created_at, fleet_id LIMIT 21`;
|
|
74
|
+
}
|
|
75
|
+
export function journeyChangesStatement(after) {
|
|
76
|
+
return Prisma.sql `SELECT c.resource_id AS "fleetId", c.seq, c.is_deleted AS "isDeleted", j.created_at AS "createdAt", j.coverage_from AS "coverageFrom", j.processed_through AS "processedThrough", j.data
|
|
77
|
+
FROM installation_journey_changes c LEFT JOIN fleet_journeys j ON j.fleet_id = c.resource_id
|
|
78
|
+
WHERE c.seq > ${after} ORDER BY c.seq LIMIT 21`;
|
|
79
|
+
}
|
|
80
|
+
export function createPrismaInstallationJourneyReads(db) {
|
|
81
|
+
return {
|
|
82
|
+
find: async (fleetId) => createPrismaJourneyRecords(db).read(fleetId),
|
|
83
|
+
page: async (position) => z.array(projectionRow).parse(await db.$queryRaw(journeyPageStatement(position))).map((row) => ({ fleetId: row.fleetId, createdAt: row.createdAt, journey: journeyOf(row) })),
|
|
84
|
+
changes: async (after) => {
|
|
85
|
+
const rows = z.array(z.object({ fleetId: idSchema('fleet'), seq: z.bigint(), isDeleted: z.boolean(), createdAt: z.date().nullable(), coverageFrom: z.date().nullable(), processedThrough: z.bigint().nullable(), data: z.unknown() })).parse(await db.$queryRaw(journeyChangesStatement(after)));
|
|
86
|
+
return rows.map((row) => ({ fleetId: row.fleetId, seq: row.seq, isDeleted: row.isDeleted,
|
|
87
|
+
journey: row.isDeleted || row.createdAt === null || row.coverageFrom === null || row.processedThrough === null ? null
|
|
88
|
+
: journeyOf({ ...row, createdAt: row.createdAt, coverageFrom: row.coverageFrom, processedThrough: row.processedThrough }),
|
|
89
|
+
}));
|
|
90
|
+
},
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
/** Kept outside the legacy unbounded list: only one fleet and the new bounded resources carry journeys. */
|
|
94
|
+
export async function readFleetJourney(db, input) {
|
|
95
|
+
const state = await createPrismaJourneyRecords(db).read(input.fleetId);
|
|
96
|
+
return state ? fleetJourneySummary(state, input.now) : undefined;
|
|
97
|
+
}
|
|
98
|
+
/** Expiry reads only due compact projections, with concurrent maintenance workers skipping held rows. */
|
|
99
|
+
export function createPrismaJourneyActivityExpiry(db) {
|
|
100
|
+
return {
|
|
101
|
+
expired: async (now, limit) => {
|
|
102
|
+
const rows = z.array(projectionRow).parse(await db.$queryRaw `SELECT fleet_id AS "fleetId", created_at AS "createdAt", coverage_from AS "coverageFrom", processed_through AS "processedThrough", data
|
|
103
|
+
FROM fleet_journeys WHERE activity_expires_at <= ${now} ORDER BY activity_expires_at, fleet_id LIMIT ${limit} FOR UPDATE SKIP LOCKED`);
|
|
104
|
+
return rows.map((row) => ({ fleetId: row.fleetId, journey: journeyOf(row) }));
|
|
105
|
+
},
|
|
106
|
+
save: async (fleetId, journey) => {
|
|
107
|
+
await createPrismaJourneyRecords(db).save(fleetId, journey);
|
|
108
|
+
await recordJourneyChange(db, { fleetId, isDeleted: false });
|
|
109
|
+
},
|
|
110
|
+
};
|
|
111
|
+
}
|
|
112
|
+
//# sourceMappingURL=fleet-journeys.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fleet-journeys.js","sourceRoot":"","sources":["../../../src/adapters/prisma/fleet-journeys.ts"],"names":[],"mappings":"AAAA,mFAAmF;AACnF,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,OAAO,EAAE,yBAAyB,EAAE,QAAQ,EAAgB,MAAM,sBAAsB,CAAC;AACzF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,mBAAmB,EAAE,mBAAmB,EAAqB,MAAM,sCAAsC,CAAC;AAK3J,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,MAAM,cAAc,GAAG,yBAAyB,CAAC,IAAI,CAAC,EAAE,sBAAsB,EAAE,IAAI,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AACnL,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AAE7J,SAAS,SAAS,CAAC,GAAkC;IACnD,OAAO,GAAG,CAAC,IAAI,KAAK,IAAI;QACtB,CAAC,CAAC,EAAE,GAAG,eAAe,CAAC,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,YAAY,EAAE,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE,CAAC,EAAE,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE;QAC9M,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,EAAM;IAC/C,OAAO;QACL,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACtB,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,SAAS,CAAA,gLAAgL,OAAO,EAAE,CAAC,CAAC;YACxP,OAAO,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1C,CAAC;QACD,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;YAC/B,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;YAC3C,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,SAAS,gBAAgB,CAAC,GAAG,qBAAqB,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAC7H,MAAM,EAAE,CAAC,WAAW,CAAA,oCAAoC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,gCAAgC,OAAO,CAAC,gBAAgB,2BAA2B,SAAS,qBAAqB,OAAO,EAAE,CAAC;QAC5M,CAAC;KACF,CAAC;AACJ,CAAC;AAED,uHAAuH;AACvH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,EAAM,EAAE,KAA+F;IAChJ,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAC3C,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,kBAAkB,CAAC,CAAC;IAC1E,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,EAAE,CAAC,WAAW,CAAA,2EAA2E,OAAO,KAAK,OAAO,CAAC,UAAU,KAAK,OAAO,CAAC,UAAU,0BAA0B,CAAC;IACjL,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,kBAAkB,EAAE,aAAa,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,gBAAgB,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAC/I,MAAM,EAAE,CAAC,WAAW,CAAA,iDAAiD,OAAO;8DAClB,OAAO,2BAA2B,KAAK,CAAC,UAAU;yBACvF,OAAO,EAAE,CAAC;QAC/B,OAAO;IACT,CAAC;IACD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,SAAS,CAAA,gLAAgL,OAAO,EAAE,CAAC,CAAC;IACxP,IAAI,CAAC,GAAG;QAAE,OAAO;IACjB,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;IAC7B,MAAM,KAAK,GAAG,MAAM,kBAAkB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,mBAAmB,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,gBAAgB,EAAE,OAAO,EAAE,CAAC,CAAC;IAC/G,MAAM,0BAA0B,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5D,sFAAsF;IACtF,IAAI,OAAO,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QAC9E,MAAM,mBAAmB,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,OAAqB;IACzC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa;QAC3E,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE,0BAA0B,EAAE,OAAO,CAAC,0BAA0B,EAAE,CAAC;AAC3G,CAAC;AAED,oGAAoG;AACpG,KAAK,UAAU,mBAAmB,CAAC,EAAM,EAAE,KAA+C;IACxF,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,SAAS,CAAA,gFAAgF,CAAC,CAAC;IACjK,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IACzE,MAAM,EAAE,CAAC,WAAW,CAAA,kFAAkF,KAAK,CAAC,OAAO,KAAK,KAAK,CAAC,GAAG,KAAK,KAAK,CAAC,SAAS;iGACtD,CAAC;AAClG,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,EAAM,EAAE,OAAgB;IAC/D,MAAM,EAAE,CAAC,WAAW,CAAA,+CAA+C,OAAO,EAAE,CAAC;IAC7E,MAAM,mBAAmB,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,CAAC;AAED,qEAAqE;AACrE,MAAM,UAAU,oBAAoB,CAAC,QAA8B;IACjE,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAA,mCAAmC,QAAQ,CAAC,SAAS,KAAK,QAAQ,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;IAChI,OAAO,MAAM,CAAC,GAAG,CAAA;0BACO,KAAK,yCAAyC,CAAC;AACzE,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,KAAa;IACnD,OAAO,MAAM,CAAC,GAAG,CAAA;;oBAEC,KAAK,0BAA0B,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,oCAAoC,CAAC,EAAM;IACzD,OAAO;QACL,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,0BAA0B,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;QACrE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,OAAO,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACtM,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACvB,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjS,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS;gBACtF,OAAO,EAAE,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,SAAS,KAAK,IAAI,IAAI,GAAG,CAAC,YAAY,KAAK,IAAI,IAAI,GAAG,CAAC,gBAAgB,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI;oBACnH,CAAC,CAAC,SAAS,CAAC,EAAE,GAAG,GAAG,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,YAAY,EAAE,GAAG,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,CAAC,gBAAgB,EAAE,CAAC;aAC5H,CAAC,CAAC,CAAC;QACN,CAAC;KACF,CAAC;AACJ,CAAC;AAED,2GAA2G;AAC3G,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EAAM,EAAE,KAAsC;IACnF,MAAM,KAAK,GAAG,MAAM,0BAA0B,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACvE,OAAO,KAAK,CAAC,CAAC,CAAC,mBAAmB,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACnE,CAAC;AAED,yGAAyG;AACzG,MAAM,UAAU,iCAAiC,CAAC,EAAM;IACtD,OAAO;QACL,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;YAC5B,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,SAAS,CAAA;2DACP,GAAG,iDAAiD,KAAK,yBAAyB,CAAC,CAAC;YACzI,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAChF,CAAC;QACD,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;YAC/B,MAAM,0BAA0B,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC5D,MAAM,mBAAmB,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;QAC/D,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -3,8 +3,24 @@ export { Prisma };
|
|
|
3
3
|
export * as $Enums from './enums.js';
|
|
4
4
|
export * from './enums.js';
|
|
5
5
|
/**
|
|
6
|
-
* Model
|
|
6
|
+
* Model FleetJourney
|
|
7
7
|
* The tenant: one operator's ships, messages and history. Ids start with flt_.
|
|
8
|
+
* A bounded operational projection, retained independently of message history.
|
|
9
|
+
*/
|
|
10
|
+
export type FleetJourney = Prisma.FleetJourneyModel;
|
|
11
|
+
/**
|
|
12
|
+
* Model InstallationJourneyClock
|
|
13
|
+
* Installation-owned commit cursor and deletion references for reconciliation.
|
|
14
|
+
*/
|
|
15
|
+
export type InstallationJourneyClock = Prisma.InstallationJourneyClockModel;
|
|
16
|
+
/**
|
|
17
|
+
* Model InstallationJourneyChange
|
|
18
|
+
*
|
|
19
|
+
*/
|
|
20
|
+
export type InstallationJourneyChange = Prisma.InstallationJourneyChangeModel;
|
|
21
|
+
/**
|
|
22
|
+
* Model Fleet
|
|
23
|
+
*
|
|
8
24
|
*/
|
|
9
25
|
export type Fleet = Prisma.FleetModel;
|
|
10
26
|
/**
|
|
@@ -12,8 +12,8 @@ export * from "./enums.js";
|
|
|
12
12
|
* const prisma = new PrismaClient({
|
|
13
13
|
* adapter: new PrismaPg({ connectionString: process.env.DATABASE_URL })
|
|
14
14
|
* })
|
|
15
|
-
* // Fetch zero or more
|
|
16
|
-
* const
|
|
15
|
+
* // Fetch zero or more FleetJourneys
|
|
16
|
+
* const fleetJourneys = await prisma.fleetJourney.findMany()
|
|
17
17
|
* ```
|
|
18
18
|
*
|
|
19
19
|
* Read more in our [docs](https://pris.ly/d/client).
|
|
@@ -22,8 +22,24 @@ export declare const PrismaClient: $Class.PrismaClientConstructor;
|
|
|
22
22
|
export type PrismaClient<LogOpts extends Prisma.LogLevel = never, OmitOpts extends Prisma.PrismaClientOptions["omit"] = Prisma.PrismaClientOptions["omit"], ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = $Class.PrismaClient<LogOpts, OmitOpts, ExtArgs>;
|
|
23
23
|
export { Prisma };
|
|
24
24
|
/**
|
|
25
|
-
* Model
|
|
25
|
+
* Model FleetJourney
|
|
26
26
|
* The tenant: one operator's ships, messages and history. Ids start with flt_.
|
|
27
|
+
* A bounded operational projection, retained independently of message history.
|
|
28
|
+
*/
|
|
29
|
+
export type FleetJourney = Prisma.FleetJourneyModel;
|
|
30
|
+
/**
|
|
31
|
+
* Model InstallationJourneyClock
|
|
32
|
+
* Installation-owned commit cursor and deletion references for reconciliation.
|
|
33
|
+
*/
|
|
34
|
+
export type InstallationJourneyClock = Prisma.InstallationJourneyClockModel;
|
|
35
|
+
/**
|
|
36
|
+
* Model InstallationJourneyChange
|
|
37
|
+
*
|
|
38
|
+
*/
|
|
39
|
+
export type InstallationJourneyChange = Prisma.InstallationJourneyChangeModel;
|
|
40
|
+
/**
|
|
41
|
+
* Model Fleet
|
|
42
|
+
*
|
|
27
43
|
*/
|
|
28
44
|
export type Fleet = Prisma.FleetModel;
|
|
29
45
|
/**
|
|
@@ -27,8 +27,8 @@ export * from "./enums.js";
|
|
|
27
27
|
* const prisma = new PrismaClient({
|
|
28
28
|
* adapter: new PrismaPg({ connectionString: process.env.DATABASE_URL })
|
|
29
29
|
* })
|
|
30
|
-
* // Fetch zero or more
|
|
31
|
-
* const
|
|
30
|
+
* // Fetch zero or more FleetJourneys
|
|
31
|
+
* const fleetJourneys = await prisma.fleetJourney.findMany()
|
|
32
32
|
* ```
|
|
33
33
|
*
|
|
34
34
|
* Read more in our [docs](https://pris.ly/d/client).
|