@aeolus-fleet/core 0.27.1 → 0.28.0

package/dist/adapters/prisma/unit-of-work.js

@@ -5,8 +5,9 @@ import { createPrismaCallerLookup, createPrismaConsoleSessionRepository, createP
 import { createPrismaInstallationRequestRepository, createPrismaInstallationSettings } from './installation.js';
 import { createPrismaDeliveryRepository, createPrismaMessageRepository } from './messaging.js';
 import { createPrismaOverdueDeliveryRepository } from './overdue.js';
-import { createPrismaDeclaredNetworkRulesRepository, createPrismaNetworkSettingsRepository, createPrismaReachRefusalRepository } from './network.js';
+import { createPrismaDeclaredNetworkRulesRepository, createPrismaNetworkRulesDraftRepository, createPrismaNetworkSettingsRepository, createPrismaReachRefusalRepository } from './network.js';
 import { createPrismaPluginConnectionRepository } from './plugin-connections.js';
+import { createPrismaVerifiedFactsRepository } from './verified-facts.js';
 import { createPrismaScopeNamespaceRepository } from './scope-namespaces.js';
 import { createPrismaClearRequestRepository, createPrismaCrewRequestRepository, createPrismaFleetRepository, createPrismaInFlightDeliveries, createPrismaLabelRepository, createPrismaLeaseRepository, createPrismaShipRepository, } from './registry.js';
 export function createPrismaTx(db) {
@@ -19,8 +20,10 @@ export function createPrismaTx(db) {
         labels: createPrismaLabelRepository(db),
         networkSettings: createPrismaNetworkSettingsRepository(db),
         declaredNetworkRules: createPrismaDeclaredNetworkRulesRepository(db),
+        networkRulesDrafts: createPrismaNetworkRulesDraftRepository(db),
         scopeNamespaces: createPrismaScopeNamespaceRepository(db),
         pluginConnections: createPrismaPluginConnectionRepository(db),
+        verifiedFacts: createPrismaVerifiedFactsRepository(db),
         reachRefusals: createPrismaReachRefusalRepository(db),
         inFlightDeliveries: createPrismaInFlightDeliveries(db),
         credentials: createPrismaCredentialRepository(db),
@@ -80,7 +83,7 @@ function createUnitOfWork(prisma, options) {
         },
     };
 }
-/** Caller lookups run outside a unit of work: each is one statement. */
+/** ShipCaller lookups run outside a unit of work: each is one statement. */
 export function createPrismaCallers(prisma) {
     return createPrismaCallerLookup(prisma);
 }

package/dist/adapters/prisma/unit-of-work.js.map

@@ -1 +1 @@
-{"version":3,"file":"unit-of-work.js","sourceRoot":"","sources":["../../../src/adapters/prisma/unit-of-work.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"unit-of-work.js","sourceRoot":"","sources":["../../../src/adapters/prisma/unit-of-work.ts"],"names":[],"mappings":"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"}

package/dist/adapters/prisma/verified-facts.d.ts

@@ -0,0 +1,4 @@
+import type { VerifiedFactsRepository } from '../../domain/registry/ports.js';
+import type { Db } from './client.js';
+/** Each writer's verified facts about a ship, on Postgres (decision 0059). */
+export declare function createPrismaVerifiedFactsRepository(db: Db): VerifiedFactsRepository;

package/dist/adapters/prisma/verified-facts.js

@@ -0,0 +1,65 @@
+import { accountIdSchema, idSchema, verifiedFactSchema } from '@aeolus-fleet/common';
+import { z } from 'zod';
+/** The columns that name a writer; the installation, which has no id, by its name. */
+function writerColumns(writer) {
+    switch (writer.kind) {
+        case 'ship':
+            return { writerKind: writer.kind, writer: writer.shipId };
+        case 'account':
+            return { writerKind: writer.kind, writer: writer.accountId };
+        case 'installation':
+            return { writerKind: writer.kind, writer: 'installation' };
+    }
+}
+/** The writer from its two columns. */
+function writerOf(kind, writer) {
+    switch (kind) {
+        case 'ship':
+            return { kind, shipId: idSchema('ship').parse(writer) };
+        case 'account':
+            return { kind, accountId: accountIdSchema.parse(writer) };
+        case 'installation':
+            return { kind };
+    }
+}
+const factsSchema = z.array(verifiedFactSchema);
+function writtenOf(row) {
+    return {
+        fleetId: idSchema('fleet').parse(row.fleetId),
+        shipId: idSchema('ship').parse(row.shipId),
+        writer: writerOf(row.writerKind, row.writer),
+        facts: factsSchema.parse(row.facts),
+        at: row.writtenAt,
+    };
+}
+/** Each writer's verified facts about a ship, on Postgres (decision 0059). */
+export function createPrismaVerifiedFactsRepository(db) {
+    return {
+        find: async (fleetId, { shipId, writer }) => {
+            const row = await db.verifiedFacts.findUnique({ where: { fleetId_shipId_writerKind_writer: { fleetId, shipId, ...writerColumns(writer) } } });
+            return row === null ? undefined : writtenOf(row);
+        },
+        save: async ({ fleetId, shipId, writer, facts, at }) => {
+            const key = { fleetId, shipId, ...writerColumns(writer) };
+            await db.verifiedFacts.upsert({
+                where: { fleetId_shipId_writerKind_writer: key },
+                create: { ...key, facts: [...facts], writtenAt: at },
+                update: { facts: [...facts], writtenAt: at },
+            });
+        },
+        list: async (fleetId) => (await db.verifiedFacts.findMany({ where: { fleetId } })).map(writtenOf),
+        listAbout: async (fleetId, shipId) => (await db.verifiedFacts.findMany({ where: { fleetId, shipId }, orderBy: [{ writtenAt: 'asc' }, { writerKind: 'asc' }, { writer: 'asc' }, { shipId: 'asc' }] })).map(writtenOf),
+        listBy: async (fleetId, shipId) => (await db.verifiedFacts.findMany({ where: { fleetId, writerKind: 'ship', writer: shipId }, orderBy: [{ writtenAt: 'asc' }, { writerKind: 'asc' }, { writer: 'asc' }, { shipId: 'asc' }] })).map(writtenOf),
+        // A transaction-level advisory lock on the fleet and the writer ship: shared for a set by it, exclusive for its retire.
+        holdWriter: async (fleetId, shipId) => {
+            await db.$executeRaw `SELECT pg_advisory_xact_lock_shared(hashtext(${fleetId}), hashtext(${`verified-facts-writer:${shipId}`}))`;
+        },
+        lockWriter: async (fleetId, shipId) => {
+            await db.$executeRaw `SELECT pg_advisory_xact_lock(hashtext(${fleetId}), hashtext(${`verified-facts-writer:${shipId}`}))`;
+        },
+        remove: async (fleetId, { shipId, writer }) => {
+            await db.verifiedFacts.deleteMany({ where: { fleetId, shipId, ...writerColumns(writer) } });
+        },
+    };
+}
+//# sourceMappingURL=verified-facts.js.map

package/dist/adapters/prisma/verified-facts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"verified-facts.js","sourceRoot":"","sources":["../../../src/adapters/prisma/verified-facts.ts"],"names":[],"mappings":"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"}

package/dist/adapters/rest/rest-api.js

@@ -10,7 +10,7 @@
  * console session cookie is never read here: REST is a door for ships.
  */
 import fastifyApiReference from '@scalar/fastify-api-reference';
-import { readBearer, readOnBehalfOf } from '../http/request-credentials.js';
+import { readAccountToken, readBearer, readOnBehalfOf } from '../http/request-credentials.js';
 import { callShip, refusalBody, SHIP_CALLS, unexpectedFailure } from '../trpc/ship-contract.js';
 import { API_TITLE, openApiDocument } from './openapi.js';
 const PREFIX = '/api/v1';
@@ -41,7 +41,7 @@ export function registerRestApi(server, options) {
             handler: async (request, reply) => {
                 try {
                     const result = await callShip(call, {
-                        ctx: options.contextFor(request, { bearer: readBearer(request.headers.authorization), onBehalfOf: readOnBehalfOf(request.headers) }),
+                        ctx: options.contextFor(request, { bearer: readBearer(request.headers.authorization), onBehalfOf: readOnBehalfOf(request.headers), accountToken: readAccountToken(request.headers) }),
                         input: request.body,
                         log: request.log,
                     });

package/dist/adapters/rest/rest-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"rest-api.js","sourceRoot":"","sources":["../../../src/adapters/rest/rest-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,mBAAmB,MAAM,+BAA+B,CAAC;AAGhE,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAE5E,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAChG,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE1D,MAAM,MAAM,GAAG,SAAS,CAAC;AAEzB,MAAM,YAAY,GAAG,GAAG,MAAM,eAAe,CAAC;AAE9C,MAAM,gBAAgB,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;AAOrD,8GAA8G;AAC9G,MAAM,UAAU,eAAe,CAAC,MAAuB,EAAE,OAAuB;IAC9E,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,CAAC;IAEjD,4EAA4E;IAC5E,4EAA4E;IAC5E,4EAA4E;IAC5E,gDAAgD;IAChD,KAAK,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE;QACxC,WAAW,EAAE,GAAG,MAAM,OAAO;QAC7B,aAAa,EAAE;YACb,GAAG,EAAE,YAAY;YACjB,SAAS,EAAE,SAAS;YACpB,gBAAgB,EAAE,KAAK;YACvB,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;YACzB,kBAAkB,EAAE,OAAO;YAC3B,SAAS,EAAE,KAAK;SACjB;KACF,CAAC,CAAC;IAEH,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;QAC9B,MAAM,CAAC,KAAK,CAAC;YACX,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,GAAG,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE;YAC7B,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;gBAChC,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE;wBAClC,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,UAAU,EAAE,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;wBACpI,KAAK,EAAE,OAAO,CAAC,IAAI;wBACnB,GAAG,EAAE,OAAO,CAAC,GAAG;qBACjB,CAAC,CAAC;oBACH,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;wBAChB,OAAO,MAAM,CAAC,MAAM,CAAC;oBACvB,CAAC;oBACD,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;gBACvF,CAAC;gBAAC,OAAO,MAAM,EAAE,CAAC;oBAChB,MAAM,OAAO,GAAG,iBAAiB,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;oBACvF,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;gBACzE,CAAC;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
+{"version":3,"file":"rest-api.js","sourceRoot":"","sources":["../../../src/adapters/rest/rest-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,mBAAmB,MAAM,+BAA+B,CAAC;AAGhE,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAE9F,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAChG,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE1D,MAAM,MAAM,GAAG,SAAS,CAAC;AAEzB,MAAM,YAAY,GAAG,GAAG,MAAM,eAAe,CAAC;AAE9C,MAAM,gBAAgB,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;AAOrD,8GAA8G;AAC9G,MAAM,UAAU,eAAe,CAAC,MAAuB,EAAE,OAAuB;IAC9E,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,CAAC;IAEjD,4EAA4E;IAC5E,4EAA4E;IAC5E,4EAA4E;IAC5E,gDAAgD;IAChD,KAAK,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE;QACxC,WAAW,EAAE,GAAG,MAAM,OAAO;QAC7B,aAAa,EAAE;YACb,GAAG,EAAE,YAAY;YACjB,SAAS,EAAE,SAAS;YACpB,gBAAgB,EAAE,KAAK;YACvB,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;YACzB,kBAAkB,EAAE,OAAO;YAC3B,SAAS,EAAE,KAAK;SACjB;KACF,CAAC,CAAC;IAEH,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;QAC9B,MAAM,CAAC,KAAK,CAAC;YACX,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,GAAG,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE;YAC7B,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;gBAChC,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE;wBAClC,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,UAAU,EAAE,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;wBACrL,KAAK,EAAE,OAAO,CAAC,IAAI;wBACnB,GAAG,EAAE,OAAO,CAAC,GAAG;qBACjB,CAAC,CAAC;oBACH,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;wBAChB,OAAO,MAAM,CAAC,MAAM,CAAC;oBACvB,CAAC;oBACD,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;gBACvF,CAAC;gBAAC,OAAO,MAAM,EAAE,CAAC;oBAChB,MAAM,OAAO,GAAG,iBAAiB,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;oBACvF,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;gBACzE,CAAC;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}

package/dist/adapters/trpc/console.d.ts

@@ -53,12 +53,14 @@ export declare const consoleRouter: import("@trpc/server").TRPCBuiltRouter<{
             session: {
                 device: string;
                 since: string;
+                accountId?: (string & import("zod").$brand<"AccountId">) | null | undefined;
             };
         } | {
             kind: "viewer";
             session: {
                 device: string;
                 since: string;
+                accountId?: (string & import("zod").$brand<"AccountId">) | null | undefined;
             };
         };
         meta: import("./trpc.js").ProcedureMeta;
@@ -80,7 +82,7 @@ export declare const consoleRouter: import("@trpc/server").TRPCBuiltRouter<{
             fleetId: `flt_${string}`;
             expiresAt: string;
             kind: "operator" | "viewer";
-            scopes: ("messages:send" | "messages:receive" | "messages:force" | "messages:resend" | "fleet:read" | "fleet:commission" | "fleet:manage" | "crew:assign" | "crew:run" | "labels:define" | "labels:assign" | "fleet:network" | "fleet:on-behalf" | "scopes:declare" | "scopes:grant")[];
+            scopes: ("messages:send" | "messages:receive" | "messages:force" | "messages:resend" | "fleet:read" | "fleet:commission" | "fleet:manage" | "crew:assign" | "crew:run" | "labels:define" | "labels:assign" | "fleet:network" | "fleet:on-behalf" | "fleet:person" | "fleet:owner" | "fleet:explain" | "fleet:connect" | "labels:any" | "fleet:verify" | "scopes:declare" | "scopes:grant")[];
         };
         meta: import("./trpc.js").ProcedureMeta;
     }>;

package/dist/adapters/trpc/context.d.ts

@@ -1,5 +1,8 @@
 import type { FleetId, SystemVersionOutput } from '@aeolus-fleet/common';
 import type { Authenticate } from '../../domain/identity/authenticate.js';
+import type { AuthenticateAccount } from '../../domain/identity/authenticate-account.js';
+import type { AuthenticateInstallation } from '../../domain/identity/authenticate-installation.js';
+import type { CutOffAccount } from '../../domain/identity/cut-off-account.js';
 import type { ReadAccount } from '../../domain/identity/read-account.js';
 import type { SetTheme } from '../../domain/identity/set-theme.js';
 import type { SignIn } from '../../domain/identity/sign-in.js';
@@ -49,6 +52,7 @@ import type { ListFleet } from '../../domain/registry/list-fleet.js';
 import type { RecrewShip } from '../../domain/registry/recrew-ship.js';
 import type { ReleaseShip } from '../../domain/registry/release-ship.js';
 import type { SetOwner } from '../../domain/registry/set-owner.js';
+import type { SetVerifiedFacts } from '../../domain/registry/set-verified-facts.js';
 import type { ConnectPlugin } from '../../domain/registry/connect-plugin.js';
 import type { RenameShip } from '../../domain/registry/rename-ship.js';
 import type { RetireShip } from '../../domain/registry/retire-ship.js';
@@ -80,12 +84,13 @@ import type { DefineLabel } from '../../domain/registry/define-label.js';
 import type { ExplainReach } from '../../domain/registry/explain-reach.js';
 import type { ReadDeclaredNetworkRules } from '../../domain/registry/read-declared-network-rules.js';
 import type { ReadReachRefusals } from '../../domain/registry/read-reach-refusals.js';
-import type { RegisterNetworkPlugin } from '../../domain/registry/register-network-plugin.js';
-import type { SetNetworkRules } from '../../domain/registry/set-network-rules.js';
+import type { ApplyNetworkRules } from '../../domain/registry/apply-network-rules.js';
+import type { DiscardNetworkRulesDraft } from '../../domain/registry/discard-network-rules-draft.js';
+import type { ReadNetworkRules } from '../../domain/registry/read-network-rules.js';
+import type { ReadNetworkRulesDraftChanges } from '../../domain/registry/read-network-rules-draft-changes.js';
+import type { SaveNetworkRulesDraft } from '../../domain/registry/save-network-rules-draft.js';
 import type { ReadBuiltInRules } from '../../domain/registry/read-built-in-rules.js';
-import type { ReadNetworkPlugin } from '../../domain/registry/read-network-plugin.js';
 import type { SetBuiltInRule } from '../../domain/registry/set-built-in-rule.js';
-import type { UnregisterNetworkPlugin } from '../../domain/registry/unregister-network-plugin.js';
 import type { DeleteLabel } from '../../domain/registry/delete-label.js';
 import type { FindLabelValue } from '../../domain/registry/find-label-value.js';
 import type { ListLabels } from '../../domain/registry/list-labels.js';
@@ -116,12 +121,16 @@ export interface UseCases {
     readGuide: ReadGuide;
     recordGuideProgress: RecordGuideProgress;
     authenticate: Authenticate;
+    authenticateAccount: AuthenticateAccount;
+    authenticateInstallation: AuthenticateInstallation;
+    cutOffAccount: CutOffAccount;
     commissionShip: CommissionShip;
     getStartingPrompt: GetStartingPrompt;
     releaseShip: ReleaseShip;
     retireShip: RetireShip;
     renameShip: RenameShip;
     setOwner: SetOwner;
+    setVerifiedFacts: SetVerifiedFacts;
     connectPlugin: ConnectPlugin;
     recrewShip: RecrewShip;
     listFleet: ListFleet;
@@ -149,12 +158,13 @@ export interface UseCases {
     declareScopes: DeclareScopes;
     grantScopes: GrantScopes;
     listScopes: ListScopes;
-    setNetworkRules: SetNetworkRules;
-    registerNetworkPlugin: RegisterNetworkPlugin;
-    unregisterNetworkPlugin: UnregisterNetworkPlugin;
+    saveNetworkRulesDraft: SaveNetworkRulesDraft;
+    discardNetworkRulesDraft: DiscardNetworkRulesDraft;
+    applyNetworkRules: ApplyNetworkRules;
+    readNetworkRules: ReadNetworkRules;
+    readNetworkRulesDraftChanges: ReadNetworkRulesDraftChanges;
     setBuiltInRule: SetBuiltInRule;
     readBuiltInRules: ReadBuiltInRules;
-    readNetworkPlugin: ReadNetworkPlugin;
     readReachRefusals: ReadReachRefusals;
     declareNetworkRules: DeclareNetworkRules;
     readDeclaredNetworkRules: ReadDeclaredNetworkRules;
@@ -212,6 +222,10 @@ export interface RequestCredentials {
     sessionToken?: string;
     /** The ship a plugin reads on behalf of, as the `Aeolus-On-Behalf-Of` header named it (decision 0034). */
     onBehalfOf?: string;
+    /** An account token pagasae signed, from the `Aeolus-Account-Token` header; a bearer crew token beside it names the ship that presented it (decision 0058). */
+    accountToken?: string;
+    /** The fleet the installation acts in, from the `Aeolus-Fleet` header, beside the installation token (decision 0057); tRPC only. */
+    fleet?: string;
 }
 /** Writes the console session cookie on the response. */
 export interface SessionCookie {