diff --git a/cloud/.trufflehog-exclude-paths.txt b/cloud/.trufflehog-exclude-paths.txt index ea20399af05..187c774d4a3 100644 --- a/cloud/.trufflehog-exclude-paths.txt +++ b/cloud/.trufflehog-exclude-paths.txt @@ -1 +1 @@ -(^|/)cloud/apps/relay/src/postgres-idle-client-error\.test\.ts$ +(^|/)cloud/apps/relay/src/database/postgres-idle-client-error\.test\.ts$ diff --git a/cloud/apps/relay/src/admin-route-transient-app.test.ts b/cloud/apps/relay/src/admin-route-transient-app.test.ts index 5ee5cbb9424..c16d8227644 100644 --- a/cloud/apps/relay/src/admin-route-transient-app.test.ts +++ b/cloud/apps/relay/src/admin-route-transient-app.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, vi } from 'vitest' import type { RelayConfig } from './config.js' -vi.mock('./admin-token-verifier.js', () => ({ +vi.mock('./authentication/admin-token-verifier.js', () => ({ createAdminTokenVerifier: () => async (token: string) => token === 'deploy-token', createReadOnlyAdminTokenVerifier: () => async () => false, createRegionalRehomeControlApplyTokenVerifier: () => async () => false, @@ -10,7 +10,7 @@ vi.mock('./admin-token-verifier.js', () => ({ createRuntimeTokenVerifier: () => async () => false })) -vi.mock('./relay-token-verifier.js', () => ({ +vi.mock('./authentication/relay-token-verifier.js', () => ({ createRelayTokenVerifier: () => async () => null, readBearer: (value: string | undefined) => value?.replace(/^Bearer /, '') ?? null })) diff --git a/cloud/apps/relay/src/app.ts b/cloud/apps/relay/src/app.ts index d2a7aeff26f..55710498d9a 100644 --- a/cloud/apps/relay/src/app.ts +++ b/cloud/apps/relay/src/app.ts @@ -1,21 +1,9 @@ -import { - AssignmentRequestSchema, - IdleRegionalRehomeRequestSchema, - type IdleRegionalRehomeRequest, - type IdleRegionalRehomeResult, - type RegionCorrectionResponse, - isRelayCellConnectionHardCap, - RELAY_ADMISSION_BUDGETS, - RELAY_DEFAULT_REGION, - RELAY_MAX_CELL_CONNECTION_UNOBSERVED_BOUND, - RELAY_PROTOCOL_LIMITS, - RelayRegionSchema, - ResolveRequestSchema, - cellPlacementCeiling, - relayCellAdmissionBounds, - type RelayCellConnectionHardCap, - type RelayRegion -} from '@orca-cloud/relay-contract' +import { AssignmentRequestSchema, ResolveRequestSchema } from '@orca-cloud/relay-contract/director-messages' +import { IdleRegionalRehomeRequestSchema, type IdleRegionalRehomeRequest, type IdleRegionalRehomeResult } from '@orca-cloud/relay-contract/idle-regional-rehome' +import type { RegionCorrectionResponse } from '@orca-cloud/relay-contract/region-correction' +import { isRelayCellConnectionHardCap, RELAY_ADMISSION_BUDGETS, RELAY_MAX_CELL_CONNECTION_UNOBSERVED_BOUND, cellPlacementCeiling, relayCellAdmissionBounds, type RelayCellConnectionHardCap } from '@orca-cloud/relay-contract/admission-budgets' +import { RELAY_DEFAULT_REGION, RelayRegionSchema, type RelayRegion } from '@orca-cloud/relay-contract/relay-regions' +import { RELAY_PROTOCOL_LIMITS } from '@orca-cloud/relay-contract/protocol-limits' import { Hono, type Context } from 'hono' import { bodyLimit } from 'hono/body-limit' import { SignJWT } from 'jose' @@ -27,7 +15,7 @@ import { createRegionalRehomeRuntimeTokenVerifier, createRegionalRehomeTokenVerifier, createRuntimeTokenVerifier -} from './admin-token-verifier.js' +} from './authentication/admin-token-verifier.js' import { RelayAssignmentRowBusyError, RelayCellInReserveModeError, @@ -41,54 +29,54 @@ import { } from './assignment/assignment-store.js' import { ASSIGNMENT_LEASE_AUDIENCE, assignmentLeaseKeyId } from './assignment/assignment-lease.js' import { AssignmentRejectionLogWindow } from './assignment/assignment-rejection-log-window.js' -import { CELL_ADMISSION_STATES } from './cell-admission-selector.js' -import { registerCellSeatFeedRoute } from './cell-seat-feed-route.js' -import { ReservePaceError, type ReserveAssignment, type ReservePlan } from './reserve-assignment.js' -import { CELL_RESERVE_ROUTE_PATHS, registerCellReserveRoutes } from './cell-reserve-routes.js' -import type { DemoteRequest, ReserveOutcome, ReserveRequest } from './cell-reserve-contract.js' -import type { CellSeatFeedPage } from './cell-seat-log.js' -import { type CellFlags, supportedCellFlags } from './cell-flags.js' -import type { AppliedControlFlags } from './relay-control-flag-channel.js' +import { CELL_ADMISSION_STATES } from './cell/admission/cell-admission-selector.js' +import { registerCellSeatFeedRoute } from './cell/seats/cell-seat-feed-route.js' +import { ReservePaceError, type ReserveAssignment, type ReservePlan } from './assignment/reserve-placement/reserve-assignment.js' +import { CELL_RESERVE_ROUTE_PATHS, registerCellReserveRoutes } from './cell/reservations/cell-reserve-routes.js' +import type { DemoteRequest, ReserveOutcome, ReserveRequest } from './cell/reservations/cell-reserve-contract.js' +import type { CellSeatFeedPage } from './cell/seats/cell-seat-log.js' +import { type CellFlags, supportedCellFlags } from './cell/control-flags/cell-flags.js' +import type { AppliedControlFlags } from './cell/control-flags/relay-control-flag-channel.js' import { RELAY_MAX_CELL_CAPACITY_REQUESTS, type RelayConfig } from './config.js' -import type { RelayCredentialStore } from './credential-store.js' -import { isRelayDatabaseTransientError } from './database.js' +import type { RelayCredentialStore } from './credentials/credential-store.js' +import { isRelayDatabaseTransientError } from './database/database.js' import { DRAIN_RETURN_MIN_RETRY_AFTER_SECONDS, RelayDrainReturnAdmission -} from './drain-return-admission.js' -import { googleMetadataIdentityToken } from './google-metadata-identity-token.js' +} from './assignment/public-admission/drain-return-admission.js' +import { googleMetadataIdentityToken } from './authentication/google-metadata-identity-token.js' import { RelayPublicAssignmentAdmission, type AssignmentAdmissionRejection -} from './public-assignment-admission.js' -import { relayHostLogDigest } from './relay-host-log-digest.js' -import type { RelayLocalReadinessVerdict } from './relay-local-readiness.js' +} from './assignment/public-admission/public-assignment-admission.js' +import { relayHostLogDigest } from './observability/relay-host-log-digest.js' +import type { RelayLocalReadinessVerdict } from './process-lifecycle/relay-local-readiness.js' import { classifyShadowSeat, type ShadowCompareDatabaseAnswer, type ShadowCompareRoute -} from './shadow-directory-compare.js' -import type { ShadowSeatDirectory } from './shadow-seat-directory.js' -import type { RelayReadinessDependency } from './relay-readiness.js' +} from './cell/seats/shadow-directory-compare.js' +import type { ShadowSeatDirectory } from './cell/seats/shadow-seat-directory.js' +import type { RelayReadinessDependency } from './process-lifecycle/relay-readiness.js' import type { AssignmentAdmissionLane, AssignmentAdmissionOutcome, AssignmentUnavailableCause, RegionalRehomeSafetySnapshot, RelayRuntimeCounts -} from './relay-observability.js' +} from './observability/relay-observability.js' import { isRegionalRehomeTrustProbe, probeRegionalRehomeTrust -} from './regional-rehome-trust-probe.js' -import { createRelayTokenVerifier, readBearer } from './relay-token-verifier.js' -import type { RelayJWKSet } from './stale-if-error-jwks.js' -import { stagingAsiaProofMembership } from './staging-asia-proof-admission.js' +} from './assignment/regional-rehome/regional-rehome-trust-probe.js' +import { createRelayTokenVerifier, readBearer } from './authentication/relay-token-verifier.js' +import type { RelayJWKSet } from './authentication/stale-if-error-jwks.js' +import { stagingAsiaProofMembership } from './cell/admission/staging-asia-proof-admission.js' import { runInStickySlot, StickySlotStatements, type StickySlotSample -} from './sticky-slot-statements.js' +} from './database/sticky-slot-statements.js' const RelayCellConnectionHardCapSchema = z.custom( isRelayCellConnectionHardCap diff --git a/cloud/apps/relay/src/assignment/assignment-cleanup-steps.ts b/cloud/apps/relay/src/assignment/assignment-cleanup-steps.ts index 23b541f0af4..25ee01aff08 100644 --- a/cloud/apps/relay/src/assignment/assignment-cleanup-steps.ts +++ b/cloud/apps/relay/src/assignment/assignment-cleanup-steps.ts @@ -1,4 +1,4 @@ -import { runRelayBackgroundOperation } from '../relay-background-operation.js' +import { runRelayBackgroundOperation } from '../process-lifecycle/relay-background-operation.js' // Each 30s sweep is idempotent and re-derives DB state, so isolate failures per step. Log sweep errors without spending dispatch-failure budget or disabling rehoming. export type AssignmentCleanupStore = { diff --git a/cloud/apps/relay/src/assignment/assignment-connection-headroom-postgres.test.ts b/cloud/apps/relay/src/assignment/assignment-connection-headroom-postgres.test.ts index 450d6a958a8..07f91d60f9d 100644 --- a/cloud/apps/relay/src/assignment/assignment-connection-headroom-postgres.test.ts +++ b/cloud/apps/relay/src/assignment/assignment-connection-headroom-postgres.test.ts @@ -5,7 +5,7 @@ import { RelayAssignmentStore } from './assignment-store.js' import { openRelayDatabase, type RelayDatabase -} from '../database.js' +} from '../database/database.js' const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL const describePostgres = databaseUrl ? describe : describe.skip diff --git a/cloud/apps/relay/src/assignment/assignment-connection-headroom-query.ts b/cloud/apps/relay/src/assignment/assignment-connection-headroom-query.ts index 69b397c015b..d19f9f2481f 100644 --- a/cloud/apps/relay/src/assignment/assignment-connection-headroom-query.ts +++ b/cloud/apps/relay/src/assignment/assignment-connection-headroom-query.ts @@ -1,4 +1,4 @@ -import { EFFECTIVE_HARD_CAP_SQL } from '../cell-connection-cap.js' +import { EFFECTIVE_HARD_CAP_SQL } from '../cell/admission/cell-connection-cap.js' export const ASSIGNMENT_CONNECTION_HEADROOM_QUERY = `SELECT limits.cell_id, ${EFFECTIVE_HARD_CAP_SQL} AS effective_hard_cap, limits.unobserved_bound, diff --git a/cloud/apps/relay/src/assignment/assignment-connection-headroom.test.ts b/cloud/apps/relay/src/assignment/assignment-connection-headroom.test.ts index 34173778536..af1f9924358 100644 --- a/cloud/apps/relay/src/assignment/assignment-connection-headroom.test.ts +++ b/cloud/apps/relay/src/assignment/assignment-connection-headroom.test.ts @@ -2,7 +2,7 @@ import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invaria import { afterEach, describe, expect, it } from 'vitest' import { RelayAssignmentStore } from './assignment-store.js' import type { RelayCellConfig } from '../config.js' -import { openInMemoryRelayDatabase, type RelayDatabase } from '../database.js' +import { openInMemoryRelayDatabase, type RelayDatabase } from '../database/database.js' const LIMITED_CELL: RelayCellConfig = { id: 'limited', diff --git a/cloud/apps/relay/src/assignment/assignment-control-supersession-postgres.test.ts b/cloud/apps/relay/src/assignment/assignment-control-supersession-postgres.test.ts index 32ddc40d562..074973fab75 100644 --- a/cloud/apps/relay/src/assignment/assignment-control-supersession-postgres.test.ts +++ b/cloud/apps/relay/src/assignment/assignment-control-supersession-postgres.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, it } from 'vitest' import { RelayAssignmentStore } from './assignment-store.js' -import { openRelayDatabase, type RelayDatabase } from '../database.js' +import { openRelayDatabase, type RelayDatabase } from '../database/database.js' const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL const describePostgres = databaseUrl ? describe : describe.skip diff --git a/cloud/apps/relay/src/assignment/assignment-dead-reserve-cell-postgres.test.ts b/cloud/apps/relay/src/assignment/assignment-dead-reserve-cell-postgres.test.ts index f40578ca4a5..a0a98088877 100644 --- a/cloud/apps/relay/src/assignment/assignment-dead-reserve-cell-postgres.test.ts +++ b/cloud/apps/relay/src/assignment/assignment-dead-reserve-cell-postgres.test.ts @@ -2,8 +2,8 @@ import { randomUUID } from 'node:crypto' import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest' import { RelayAssignmentStore } from './assignment-store.js' import type { RelayCellConfig } from '../config.js' -import { openRelayDatabase, type RelayDatabase } from '../database.js' -import { ReserveLedgerWriter } from '../reserve-ledger-writer.js' +import { openRelayDatabase, type RelayDatabase } from '../database/database.js' +import { ReserveLedgerWriter } from './reserve-placement/reserve-ledger-writer.js' // Only host-requested moves may leave a reserve cell proven dead by heartbeat and poll silence without a fence; live cells retain hosts. diff --git a/cloud/apps/relay/src/assignment/assignment-deployment-status-postgres.test.ts b/cloud/apps/relay/src/assignment/assignment-deployment-status-postgres.test.ts index 2f280c9873d..ad45a84cba9 100644 --- a/cloud/apps/relay/src/assignment/assignment-deployment-status-postgres.test.ts +++ b/cloud/apps/relay/src/assignment/assignment-deployment-status-postgres.test.ts @@ -1,7 +1,7 @@ import pg from 'pg' import { afterAll, beforeAll, describe, expect, it } from 'vitest' import { RelayAssignmentStore } from './assignment-store.js' -import { openRelayDatabase, type RelayDatabase } from '../database.js' +import { openRelayDatabase, type RelayDatabase } from '../database/database.js' const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL const describePostgres = databaseUrl ? describe : describe.skip diff --git a/cloud/apps/relay/src/assignment/assignment-headroom-scope.test.ts b/cloud/apps/relay/src/assignment/assignment-headroom-scope.test.ts index a6f6ea31ffc..d7ba52e9682 100644 --- a/cloud/apps/relay/src/assignment/assignment-headroom-scope.test.ts +++ b/cloud/apps/relay/src/assignment/assignment-headroom-scope.test.ts @@ -1,6 +1,6 @@ import { afterEach, describe, expect, it } from 'vitest' import { RelayAssignmentStore } from './assignment-store.js' -import { openInMemoryRelayDatabase, type RelayDatabase } from '../database.js' +import { openInMemoryRelayDatabase, type RelayDatabase } from '../database/database.js' const NOW = 100_000 const CELL_COUNT = 32 diff --git a/cloud/apps/relay/src/assignment/assignment-home-cell-unavailable.test.ts b/cloud/apps/relay/src/assignment/assignment-home-cell-unavailable.test.ts index e4990dd6dec..45cf0bf704c 100644 --- a/cloud/apps/relay/src/assignment/assignment-home-cell-unavailable.test.ts +++ b/cloud/apps/relay/src/assignment/assignment-home-cell-unavailable.test.ts @@ -1,7 +1,7 @@ import { afterEach, describe, expect, it } from 'vitest' import { RelayAssignmentStore, RelayHomeCellUnavailableError } from './assignment-store.js' import type { RelayCellConfig } from '../config.js' -import { openInMemoryRelayDatabase, type RelayDatabase } from '../database.js' +import { openInMemoryRelayDatabase, type RelayDatabase } from '../database/database.js' const HEARTBEAT_TTL_MS = 45_000 const START_MS = 100 diff --git a/cloud/apps/relay/src/assignment/assignment-inventory-snapshot.test.ts b/cloud/apps/relay/src/assignment/assignment-inventory-snapshot.test.ts index d5e0b02855a..006c7346dd8 100644 --- a/cloud/apps/relay/src/assignment/assignment-inventory-snapshot.test.ts +++ b/cloud/apps/relay/src/assignment/assignment-inventory-snapshot.test.ts @@ -3,7 +3,7 @@ import { formatAssignmentInventorySnapshot, readAssignmentInventorySnapshot } from './assignment-inventory-snapshot.js' -import { openInMemoryRelayDatabase } from '../database.js' +import { openInMemoryRelayDatabase } from '../database/database.js' describe('assignment inventory snapshot', () => { it('reports per-cell counters, lease backlog, and reservation debt', async () => { diff --git a/cloud/apps/relay/src/assignment/assignment-inventory-snapshot.ts b/cloud/apps/relay/src/assignment/assignment-inventory-snapshot.ts index b17fb8dcf04..073a7d958e9 100644 --- a/cloud/apps/relay/src/assignment/assignment-inventory-snapshot.ts +++ b/cloud/apps/relay/src/assignment/assignment-inventory-snapshot.ts @@ -1,6 +1,6 @@ -import { RELAY_DEFAULT_REGION } from '@orca-cloud/relay-contract' -import type { RelayDatabase, SqlRow } from '../database.js' -import { REGIONAL_REHOME_ABORT_REPORT_WINDOW_MS } from '../regional-rehome-abort-reason.js' +import { RELAY_DEFAULT_REGION } from '@orca-cloud/relay-contract/relay-regions' +import type { RelayDatabase, SqlRow } from '../database/database.js' +import { REGIONAL_REHOME_ABORT_REPORT_WINDOW_MS } from './regional-rehome/regional-rehome-abort-reason.js' export type CellInventorySnapshotRow = { cellId: string diff --git a/cloud/apps/relay/src/assignment/assignment-isolated-cell-replacement-postgres.test.ts b/cloud/apps/relay/src/assignment/assignment-isolated-cell-replacement-postgres.test.ts index 61bea6c30f3..d552d8710e8 100644 --- a/cloud/apps/relay/src/assignment/assignment-isolated-cell-replacement-postgres.test.ts +++ b/cloud/apps/relay/src/assignment/assignment-isolated-cell-replacement-postgres.test.ts @@ -6,9 +6,9 @@ import { encodeMembership, type CellAdmissionMembership, type CellAdmissionState -} from '../cell-admission-selector.js' +} from '../cell/admission/cell-admission-selector.js' import type { RelayCellConfig } from '../config.js' -import { openRelayDatabase, type RelayDatabase } from '../database.js' +import { openRelayDatabase, type RelayDatabase } from '../database/database.js' const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL const describePostgres = databaseUrl ? describe : describe.skip diff --git a/cloud/apps/relay/src/assignment/assignment-isolated-cell-replacement.test.ts b/cloud/apps/relay/src/assignment/assignment-isolated-cell-replacement.test.ts index f6a6a013279..49bf26fde73 100644 --- a/cloud/apps/relay/src/assignment/assignment-isolated-cell-replacement.test.ts +++ b/cloud/apps/relay/src/assignment/assignment-isolated-cell-replacement.test.ts @@ -1,12 +1,12 @@ import { createHash } from 'node:crypto' import { afterEach, describe, expect, it, vi } from 'vitest' import { RelayAssignmentStore, RelayHomeCellUnavailableError } from './assignment-store.js' -import { ReservePaceError } from '../reserve-assignment.js' +import { ReservePaceError } from './reserve-placement/reserve-assignment.js' import { encodeMembership, type CellAdmissionMembership, type CellAdmissionState -} from '../cell-admission-selector.js' +} from '../cell/admission/cell-admission-selector.js' import type { RelayCellConfig } from '../config.js' import { openInMemoryRelayDatabase, @@ -14,7 +14,7 @@ import { type RelayLockOptions, type RelayTransactionOptions, type SqlRow -} from '../database.js' +} from '../database/database.js' // migration-only also holds evacuation targets, Asia rollback and failed-wave/new cells; only same-cap isolate writes rollIsolatedCells, and restore clears its stamp atomically (orca-relay-operations.md). const HEARTBEAT_TTL_MS = 45_000 diff --git a/cloud/apps/relay/src/assignment/assignment-lease-shadow.ts b/cloud/apps/relay/src/assignment/assignment-lease-shadow.ts index 338fd938c6d..1629dc13a24 100644 --- a/cloud/apps/relay/src/assignment/assignment-lease-shadow.ts +++ b/cloud/apps/relay/src/assignment/assignment-lease-shadow.ts @@ -1,4 +1,4 @@ -import { percentile } from '../relay-observability.js' +import { percentile } from '../observability/relay-observability.js' import { classifyAssignmentLease, type AssignmentLeaseClass } from './assignment-lease.js' // Compare enforce’s hypothetical lease verdict with the authoritative DB answer; agree/disagree exposes valid leases the DB refuses before lease-only admission. diff --git a/cloud/apps/relay/src/assignment/assignment-lease.test.ts b/cloud/apps/relay/src/assignment/assignment-lease.test.ts index c26d76b308a..d5ac8680c58 100644 --- a/cloud/apps/relay/src/assignment/assignment-lease.test.ts +++ b/cloud/apps/relay/src/assignment/assignment-lease.test.ts @@ -1,6 +1,6 @@ import { createHash } from 'node:crypto' import { EventEmitter } from 'node:events' -import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract' +import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes' import { SignJWT } from 'jose' import nacl from 'tweetnacl' import { describe, expect, it, vi } from 'vitest' @@ -13,10 +13,10 @@ import { import { AssignmentLeaseShadow } from './assignment-lease-shadow.js' import type { RelayAssignmentStore } from './assignment-store.js' import type { RelayConfig } from '../config.js' -import type { RelayCredentialStore } from '../credential-store.js' -import { HostSessionRegistry } from '../host-session-registry.js' -import type { RelayTokenClaims } from '../relay-token-verifier.js' -import { ProcessQueuedByteBudget } from '../splice-forwarder.js' +import type { RelayCredentialStore } from '../credentials/credential-store.js' +import { HostSessionRegistry } from '../connections/host-session-registry.js' +import type { RelayTokenClaims } from '../authentication/relay-token-verifier.js' +import { ProcessQueuedByteBudget } from '../connections/splice-forwarder.js' const KEY = new TextEncoder().encode('0123456789abcdef0123456789abcdef') const OTHER_KEY = new TextEncoder().encode('fedcba9876543210fedcba9876543210') diff --git a/cloud/apps/relay/src/assignment/assignment-placed-marker.test.ts b/cloud/apps/relay/src/assignment/assignment-placed-marker.test.ts index 9e69a8496f6..205f03576a0 100644 --- a/cloud/apps/relay/src/assignment/assignment-placed-marker.test.ts +++ b/cloud/apps/relay/src/assignment/assignment-placed-marker.test.ts @@ -1,7 +1,7 @@ import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invariants' import { afterEach, describe, expect, it } from 'vitest' import { RelayAssignmentStore } from './assignment-store.js' -import { openInMemoryRelayDatabase, type RelayDatabase } from '../database.js' +import { openInMemoryRelayDatabase, type RelayDatabase } from '../database/database.js' const CELL = { id: 'cell-a', url: 'https://relay-a.example.com', capacityRequests: 10 } const IDENTITY = { userId: 'user-a', relayHostId: 'host000000000001' } diff --git a/cloud/apps/relay/src/assignment/assignment-rejection-logging.test.ts b/cloud/apps/relay/src/assignment/assignment-rejection-logging.test.ts index 2cce9a43653..d87c9879726 100644 --- a/cloud/apps/relay/src/assignment/assignment-rejection-logging.test.ts +++ b/cloud/apps/relay/src/assignment/assignment-rejection-logging.test.ts @@ -9,13 +9,13 @@ const fakes = vi.hoisted(() => ({ })) })) -vi.mock('../relay-token-verifier.js', () => ({ +vi.mock('../authentication/relay-token-verifier.js', () => ({ createRelayTokenVerifier: () => fakes.verifyRelayToken, readBearer: (value: string | undefined) => value?.replace(/^Bearer /, '') ?? null })) import { createRelayApp } from '../app.js' -import { relayHostLogDigest } from '../relay-host-log-digest.js' +import { relayHostLogDigest } from '../observability/relay-host-log-digest.js' describe('assignment rejection logging', () => { afterEach(() => { diff --git a/cloud/apps/relay/src/assignment/assignment-reserve-mode-evacuation.test.ts b/cloud/apps/relay/src/assignment/assignment-reserve-mode-evacuation.test.ts index e48d2b76346..962835176d2 100644 --- a/cloud/apps/relay/src/assignment/assignment-reserve-mode-evacuation.test.ts +++ b/cloud/apps/relay/src/assignment/assignment-reserve-mode-evacuation.test.ts @@ -1,7 +1,7 @@ import { afterEach, describe, expect, it } from 'vitest' import { RelayAssignmentStore } from './assignment-store.js' import type { RelayCellConfig } from '../config.js' -import { openInMemoryRelayDatabase, type RelayDatabase } from '../database.js' +import { openInMemoryRelayDatabase, type RelayDatabase } from '../database/database.js' const CELLS: RelayCellConfig[] = [ { id: 'cell-a', url: 'https://relay-a.example.com', capacityRequests: 10 }, diff --git a/cloud/apps/relay/src/assignment/assignment-reserve-mode-postgres.test.ts b/cloud/apps/relay/src/assignment/assignment-reserve-mode-postgres.test.ts index cc9c026e167..dcd1ecca97c 100644 --- a/cloud/apps/relay/src/assignment/assignment-reserve-mode-postgres.test.ts +++ b/cloud/apps/relay/src/assignment/assignment-reserve-mode-postgres.test.ts @@ -3,7 +3,7 @@ import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invaria import { afterAll, beforeAll, describe, expect, it } from 'vitest' import { CELL_ADMIT_EFFECTIVE_FRESH_MS, RelayAssignmentStore } from './assignment-store.js' import type { RelayCellConfig } from '../config.js' -import { openRelayDatabase, type RelayDatabase } from '../database.js' +import { openRelayDatabase, type RelayDatabase } from '../database/database.js' // Exercise admit-mode SQL, locked open-flow checks and live-reserve pins on PostgreSQL, not SQLite alone. diff --git a/cloud/apps/relay/src/assignment/assignment-reserve-mode.test.ts b/cloud/apps/relay/src/assignment/assignment-reserve-mode.test.ts index 72f371c1192..33f90609601 100644 --- a/cloud/apps/relay/src/assignment/assignment-reserve-mode.test.ts +++ b/cloud/apps/relay/src/assignment/assignment-reserve-mode.test.ts @@ -2,7 +2,7 @@ import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invaria import { afterEach, describe, expect, it, vi } from 'vitest' import { RelayAssignmentStore, RelayCellInReserveModeError } from './assignment-store.js' import type { RelayCellConfig } from '../config.js' -import { openInMemoryRelayDatabase, type RelayDatabase } from '../database.js' +import { openInMemoryRelayDatabase, type RelayDatabase } from '../database/database.js' const CELLS: RelayCellConfig[] = [ { id: 'cell-a', url: 'https://relay-a.example.com', capacityRequests: 10 }, diff --git a/cloud/apps/relay/src/assignment/assignment-reserve-spill.test.ts b/cloud/apps/relay/src/assignment/assignment-reserve-spill.test.ts index e82468562d1..d4e5c7fde3b 100644 --- a/cloud/apps/relay/src/assignment/assignment-reserve-spill.test.ts +++ b/cloud/apps/relay/src/assignment/assignment-reserve-spill.test.ts @@ -12,8 +12,8 @@ import { type RelayLockOptions, type RelayTransactionOptions, type SqlRow -} from '../database.js' -import { ReservePaceError } from '../reserve-assignment.js' +} from '../database/database.js' +import { ReservePaceError } from './reserve-placement/reserve-assignment.js' const CELLS: RelayCellConfig[] = [ { id: 'us-c1', url: 'https://us-c1.relay.example.com', region: 'us-central1', capacityRequests: 100 }, diff --git a/cloud/apps/relay/src/assignment/assignment-roll-replaced-cell.test.ts b/cloud/apps/relay/src/assignment/assignment-roll-replaced-cell.test.ts index 26ea4dedc58..0b5a00dd757 100644 --- a/cloud/apps/relay/src/assignment/assignment-roll-replaced-cell.test.ts +++ b/cloud/apps/relay/src/assignment/assignment-roll-replaced-cell.test.ts @@ -8,9 +8,9 @@ import { encodeMembership, type CellAdmissionMembership, type CellAdmissionState -} from '../cell-admission-selector.js' +} from '../cell/admission/cell-admission-selector.js' import type { RelayCellConfig } from '../config.js' -import { openInMemoryRelayDatabase, type RelayDatabase } from '../database.js' +import { openInMemoryRelayDatabase, type RelayDatabase } from '../database/database.js' // 2026-10-24, production-gce-c15: offline hosts redialed during the ~45s gap between draining a same-cap roll and replacement readiness. const HEARTBEAT_TTL_MS = 45_000 diff --git a/cloud/apps/relay/src/assignment/assignment-row-lock-order-postgres.test.ts b/cloud/apps/relay/src/assignment/assignment-row-lock-order-postgres.test.ts index 9e570a9317e..e05f3f2310c 100644 --- a/cloud/apps/relay/src/assignment/assignment-row-lock-order-postgres.test.ts +++ b/cloud/apps/relay/src/assignment/assignment-row-lock-order-postgres.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, it } from 'vitest' import { RelayAssignmentStore } from './assignment-store.js' -import { openRelayDatabase, type RelayDatabase } from '../database.js' +import { openRelayDatabase, type RelayDatabase } from '../database/database.js' const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL const describePostgres = databaseUrl ? describe : describe.skip diff --git a/cloud/apps/relay/src/assignment/assignment-store.test.ts b/cloud/apps/relay/src/assignment/assignment-store.test.ts index d4eb9daa457..fab6a34fd95 100644 --- a/cloud/apps/relay/src/assignment/assignment-store.test.ts +++ b/cloud/apps/relay/src/assignment/assignment-store.test.ts @@ -7,14 +7,14 @@ import { RelayAssignmentStore, STRANDED_MIGRATION_ABANDON_MS } from './assignment-store.js' -import { encodeMembership, type CellAdmissionMembership } from '../cell-admission-selector.js' +import { encodeMembership, type CellAdmissionMembership } from '../cell/admission/cell-admission-selector.js' import { openInMemoryRelayDatabase, type RelayDatabase, type RelayLockOptions, type RelayTransactionOptions, type SqlRow -} from '../database.js' +} from '../database/database.js' const CELLS: RelayCellConfig[] = [ { id: 'cell-a', url: 'https://relay-a.example.com', capacityRequests: 2 }, diff --git a/cloud/apps/relay/src/assignment/assignment-store.ts b/cloud/apps/relay/src/assignment/assignment-store.ts index 42b1bb0d556..08684036d7c 100644 --- a/cloud/apps/relay/src/assignment/assignment-store.ts +++ b/cloud/apps/relay/src/assignment/assignment-store.ts @@ -1,28 +1,28 @@ -import { claimDeadManTripSlot } from '../cell-dead-man-trip-slot.js' -import { createDrainMigrationRowLookup } from '../drain-migration-row-lookup.js' -import { HeapWindowReaper } from '../heap-window-reaper.js' -import type { PlacementLoadBand } from '../placement-load-band.js' -import type { SeatFeedCell } from '../shadow-seat-directory.js' +import { claimDeadManTripSlot } from '../cell/reservations/cell-dead-man-trip-slot.js' +import { createDrainMigrationRowLookup } from './migrations/drain-migration-row-lookup.js' +import { HeapWindowReaper } from '../credentials/heap-window-reaper.js' +import type { PlacementLoadBand } from './reserve-placement/placement-load-band.js' +import type { SeatFeedCell } from '../cell/seats/shadow-seat-directory.js' import { selectIdleRegionalRehomes, type IdleRegionalRehomeCandidate, type IdleRehomeHostCursor -} from '../idle-regional-rehome-selection.js' +} from './regional-rehome/idle-regional-rehome-selection.js' import { RegionalRehomePollTelemetry, type RegionalRehomePollGate -} from '../regional-rehome-poll-telemetry.js' -import { readRegionCorrectionOutcomes } from '../region-correction-outcomes.js' -import { ReservePaceError } from '../reserve-assignment.js' +} from './regional-rehome/regional-rehome-poll-telemetry.js' +import { readRegionCorrectionOutcomes } from './regional-rehome/region-correction-outcomes.js' +import { ReservePaceError } from './reserve-placement/reserve-assignment.js' import { previewRegionalRehomeEligibility, type RegionCorrectionPreview -} from '../region-correction-preview.js' +} from './regional-rehome/region-correction-preview.js' import { exchangeRegionCorrection, previewRegionCorrection, REGIONAL_REHOME_CONCURRENT_LIMIT -} from '../region-correction-state.js' +} from './regional-rehome/region-correction-state.js' import { randomUUID } from 'node:crypto' import { performance } from 'node:perf_hooks' import { @@ -57,11 +57,11 @@ import { type CellAdmissionMembership, type CellAdmissionSelectorInspection, type CellAdmissionState -} from '../cell-admission-selector.js' +} from '../cell/admission/cell-admission-selector.js' import { RelayMigrationCellRegistrar, type MigrationCellRegistration -} from '../cell-admission-migration-registration.js' +} from '../cell/admission/cell-admission-migration-registration.js' import { ASSIGNMENT_CONNECTION_HEADROOM_QUERY } from './assignment-connection-headroom-query.js' import { CONNECTION_CAP_COLUMNS_SQL, @@ -72,7 +72,7 @@ import { reportedHardCapWithinLimit, writeCellConnectionLimit, type CellConnectionCap -} from '../cell-connection-cap.js' +} from '../cell/admission/cell-connection-cap.js' import { AssignmentIdentityQueue } from './assignment-identity-queue.js' import { CONTROL_RENEWAL_BATCH_SQL, @@ -82,20 +82,20 @@ import { readControlRenewalOutcomes, type ControlRenewalOutcome, type ControlRenewalRequest -} from '../control-renewal-statement.js' -import { commitWithFinalWrite, REGIONAL_REHOME_DEFAULT_HOST_COOLDOWN_MS } from '../database.js' +} from '../control-leases/control-renewal-statement.js' +import { commitWithFinalWrite, REGIONAL_REHOME_DEFAULT_HOST_COOLDOWN_MS } from '../database/database.js' import type { RelayCellConfig } from '../config.js' -import type { CellLockHoldSite } from '../cell-inventory-hold-samples.js' -import type { DeadCellVerdict } from '../cell-poll-reachability.js' -import { isPostgresPoolConnectFailure } from '../postgres-pool-pressure.js' -import { isPostgresReadTimeout } from '../relay-database-rejection-fence.js' +import type { CellLockHoldSite } from '../database/cell-inventory-hold-samples.js' +import type { DeadCellVerdict } from '../cell/seats/cell-poll-reachability.js' +import { isPostgresPoolConnectFailure } from '../database/postgres-pool-pressure.js' +import { isPostgresReadTimeout } from '../database/relay-database-rejection-fence.js' import type { RelayDatabase, RelayLockOptions, RelayTransactionOptions, SqlRow -} from '../database.js' -import type { RegionalRehomeSafetySnapshot } from '../relay-observability.js' +} from '../database/database.js' +import type { RegionalRehomeSafetySnapshot } from '../observability/relay-observability.js' import { combineRegionalRehomeSafety, nextRegionalRehomeSqlFailuresBreach, @@ -105,16 +105,16 @@ import { regionalRehomeSafetyFailure, regionalRehomeSqlFailuresSustained, type RegionalRehomeSqlFailuresBreach -} from '../regional-rehome-safety.js' +} from './regional-rehome/regional-rehome-safety.js' import { REGIONAL_REHOME_ARRIVAL_WINDOW_MS, type RegionalRehomeAbortReason -} from '../regional-rehome-abort-reason.js' +} from './regional-rehome/regional-rehome-abort-reason.js' import { ABANDONED_REGISTERED_MIGRATION, DURABLY_FENCED_MIGRATION_SOURCE, REGISTERED_MIGRATION_ABANDON_MS -} from '../registered-migration-abandonment.js' +} from './migrations/registered-migration-abandonment.js' type AssignmentIdentity = { userId: string; relayHostId: string } type CellHeartbeat = { diff --git a/cloud/apps/relay/src/host-cohort-bucket.ts b/cloud/apps/relay/src/assignment/host-cohort-bucket.ts similarity index 100% rename from cloud/apps/relay/src/host-cohort-bucket.ts rename to cloud/apps/relay/src/assignment/host-cohort-bucket.ts diff --git a/cloud/apps/relay/src/dead-cell-evacuation-precheck.test.ts b/cloud/apps/relay/src/assignment/migrations/dead-cell-evacuation-precheck.test.ts similarity index 96% rename from cloud/apps/relay/src/dead-cell-evacuation-precheck.test.ts rename to cloud/apps/relay/src/assignment/migrations/dead-cell-evacuation-precheck.test.ts index 9f486c38145..9d72905967d 100644 --- a/cloud/apps/relay/src/dead-cell-evacuation-precheck.test.ts +++ b/cloud/apps/relay/src/assignment/migrations/dead-cell-evacuation-precheck.test.ts @@ -1,13 +1,13 @@ import pg from 'pg' import { afterAll, afterEach, describe, expect, it } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { RelayCellConfig } from './config.js' +import { RelayAssignmentStore } from '../assignment-store.js' +import type { RelayCellConfig } from '../../config.js' import { openInMemoryRelayDatabase, openRelayDatabase, type RelayDatabase, type SqlRow -} from './database.js' +} from '../../database/database.js' // Both dialects must skip host scans with no actionable cells; stale existing-only rows previously scanned every assignment for nothing. const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL diff --git a/cloud/apps/relay/src/drain-migration-row-lookup.test.ts b/cloud/apps/relay/src/assignment/migrations/drain-migration-row-lookup.test.ts similarity index 97% rename from cloud/apps/relay/src/drain-migration-row-lookup.test.ts rename to cloud/apps/relay/src/assignment/migrations/drain-migration-row-lookup.test.ts index 72df5224ee2..b3acd5f62d6 100644 --- a/cloud/apps/relay/src/drain-migration-row-lookup.test.ts +++ b/cloud/apps/relay/src/assignment/migrations/drain-migration-row-lookup.test.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest' import { createDrainMigrationRowLookup } from './drain-migration-row-lookup.js' -import type { SqlRow } from './database.js' +import type { SqlRow } from '../../database/database.js' function text(row: SqlRow, field: string): string { const value = row[field] diff --git a/cloud/apps/relay/src/drain-migration-row-lookup.ts b/cloud/apps/relay/src/assignment/migrations/drain-migration-row-lookup.ts similarity index 96% rename from cloud/apps/relay/src/drain-migration-row-lookup.ts rename to cloud/apps/relay/src/assignment/migrations/drain-migration-row-lookup.ts index b9dd5776f7d..6f07e7f903b 100644 --- a/cloud/apps/relay/src/drain-migration-row-lookup.ts +++ b/cloud/apps/relay/src/assignment/migrations/drain-migration-row-lookup.ts @@ -1,4 +1,4 @@ -import type { SqlRow } from './database.js' +import type { SqlRow } from '../../database/database.js' type Identity = { userId: string; relayHostId: string } type RowIndex = Map> diff --git a/cloud/apps/relay/src/drain-migration-row-scaling.test.ts b/cloud/apps/relay/src/assignment/migrations/drain-migration-row-scaling.test.ts similarity index 95% rename from cloud/apps/relay/src/drain-migration-row-scaling.test.ts rename to cloud/apps/relay/src/assignment/migrations/drain-migration-row-scaling.test.ts index c0f4184b710..6eed78f80a1 100644 --- a/cloud/apps/relay/src/drain-migration-row-scaling.test.ts +++ b/cloud/apps/relay/src/assignment/migrations/drain-migration-row-scaling.test.ts @@ -1,7 +1,7 @@ -import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract' +import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invariants' import { afterEach, expect, it } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import { openInMemoryRelayDatabase, type RelayDatabase, type SqlRow } from './database.js' +import { RelayAssignmentStore } from '../assignment-store.js' +import { openInMemoryRelayDatabase, type RelayDatabase, type SqlRow } from '../../database/database.js' let database: RelayDatabase | undefined afterEach(async () => await database?.close()) diff --git a/cloud/apps/relay/src/drain-release-cell-row-contention-postgres.test.ts b/cloud/apps/relay/src/assignment/migrations/drain-release-cell-row-contention-postgres.test.ts similarity index 99% rename from cloud/apps/relay/src/drain-release-cell-row-contention-postgres.test.ts rename to cloud/apps/relay/src/assignment/migrations/drain-release-cell-row-contention-postgres.test.ts index 3d5b77c4aa6..1bfdbefab18 100644 --- a/cloud/apps/relay/src/drain-release-cell-row-contention-postgres.test.ts +++ b/cloud/apps/relay/src/assignment/migrations/drain-release-cell-row-contention-postgres.test.ts @@ -1,23 +1,23 @@ import { createHash } from 'node:crypto' import { afterAll, beforeAll, describe, expect, it } from 'vitest' -import { RelayAssignmentRowBusyError, RelayAssignmentStore } from './assignment/assignment-store.js' +import { RelayAssignmentRowBusyError, RelayAssignmentStore } from '../assignment-store.js' import { encodeMembership, type CellAdmissionMembership, type CellAdmissionState -} from './cell-admission-selector.js' -import type { RelayCellConfig } from './config.js' +} from '../../cell/admission/cell-admission-selector.js' +import type { RelayCellConfig } from '../../config.js' import { consumeRelayCellInventoryHold, consumeRelayDatabasePoolPressure, openRelayDatabase, type RelayDatabase -} from './database.js' -import { RelayPublicAssignmentAdmission } from './public-assignment-admission.js' +} from '../../database/database.js' +import { RelayPublicAssignmentAdmission } from '../public-admission/public-assignment-admission.js' import { openDelayedPostgresDatabase, type StatementDelay -} from './test-fixtures/delayed-postgres-database.js' +} from '../../test-fixtures/delayed-postgres-database.js' // Reproduce Asia source-row release locks during reconnect placement: fleet locking fell to ~9/s at 6 releases/s and ~5/s at 18/s. Assert/report target-only locking avoids that contention. diff --git a/cloud/apps/relay/src/migration-recovery-postgres.test.ts b/cloud/apps/relay/src/assignment/migrations/migration-recovery-postgres.test.ts similarity index 99% rename from cloud/apps/relay/src/migration-recovery-postgres.test.ts rename to cloud/apps/relay/src/assignment/migrations/migration-recovery-postgres.test.ts index f21503f22d4..e560b1115da 100644 --- a/cloud/apps/relay/src/migration-recovery-postgres.test.ts +++ b/cloud/apps/relay/src/assignment/migrations/migration-recovery-postgres.test.ts @@ -1,11 +1,11 @@ -import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract' +import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invariants' import { afterAll, beforeAll, describe, expect, it } from 'vitest' import { RelayAssignmentStore, STRANDED_MIGRATION_ABANDON_MS, type RelayAssignmentMigration -} from './assignment/assignment-store.js' -import { openRelayDatabase, type RelayDatabase } from './database.js' +} from '../assignment-store.js' +import { openRelayDatabase, type RelayDatabase } from '../../database/database.js' import { readRegisteredMigrationInventory } from './registered-migration-inventory.js' const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL diff --git a/cloud/apps/relay/src/postgres-drain-send-locking.test.ts b/cloud/apps/relay/src/assignment/migrations/postgres-drain-send-locking.test.ts similarity index 97% rename from cloud/apps/relay/src/postgres-drain-send-locking.test.ts rename to cloud/apps/relay/src/assignment/migrations/postgres-drain-send-locking.test.ts index 8e0ec89e282..5b75ce6ecba 100644 --- a/cloud/apps/relay/src/postgres-drain-send-locking.test.ts +++ b/cloud/apps/relay/src/assignment/migrations/postgres-drain-send-locking.test.ts @@ -1,6 +1,6 @@ import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import { openRelayDatabase, type RelayDatabase } from './database.js' +import { RelayAssignmentStore } from '../assignment-store.js' +import { openRelayDatabase, type RelayDatabase } from '../../database/database.js' const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL const describePostgres = databaseUrl ? describe : describe.skip diff --git a/cloud/apps/relay/src/registered-migration-abandonment.ts b/cloud/apps/relay/src/assignment/migrations/registered-migration-abandonment.ts similarity index 100% rename from cloud/apps/relay/src/registered-migration-abandonment.ts rename to cloud/apps/relay/src/assignment/migrations/registered-migration-abandonment.ts diff --git a/cloud/apps/relay/src/registered-migration-inventory-postgres.test.ts b/cloud/apps/relay/src/assignment/migrations/registered-migration-inventory-postgres.test.ts similarity index 98% rename from cloud/apps/relay/src/registered-migration-inventory-postgres.test.ts rename to cloud/apps/relay/src/assignment/migrations/registered-migration-inventory-postgres.test.ts index ad318b2ad3a..3a4e02db149 100644 --- a/cloud/apps/relay/src/registered-migration-inventory-postgres.test.ts +++ b/cloud/apps/relay/src/assignment/migrations/registered-migration-inventory-postgres.test.ts @@ -1,6 +1,6 @@ import pg from 'pg' import { afterAll, beforeAll, describe, expect, it } from 'vitest' -import { openRelayDatabase, type RelayDatabase } from './database.js' +import { openRelayDatabase, type RelayDatabase } from '../../database/database.js' import { REGISTERED_MIGRATION_ABANDON_MS } from './registered-migration-abandonment.js' import { readRegisteredMigrationInventory } from './registered-migration-inventory.js' diff --git a/cloud/apps/relay/src/registered-migration-inventory.test.ts b/cloud/apps/relay/src/assignment/migrations/registered-migration-inventory.test.ts similarity index 99% rename from cloud/apps/relay/src/registered-migration-inventory.test.ts rename to cloud/apps/relay/src/assignment/migrations/registered-migration-inventory.test.ts index 85d32fb0d0e..1eca0b1749d 100644 --- a/cloud/apps/relay/src/registered-migration-inventory.test.ts +++ b/cloud/apps/relay/src/assignment/migrations/registered-migration-inventory.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, expect, it } from 'vitest' -import { openInMemoryRelayDatabase, type RelayDatabase } from './database.js' +import { openInMemoryRelayDatabase, type RelayDatabase } from '../../database/database.js' import { REGISTERED_MIGRATION_ABANDON_MS } from './registered-migration-abandonment.js' import { formatRegisteredMigrationInventory, diff --git a/cloud/apps/relay/src/registered-migration-inventory.ts b/cloud/apps/relay/src/assignment/migrations/registered-migration-inventory.ts similarity index 98% rename from cloud/apps/relay/src/registered-migration-inventory.ts rename to cloud/apps/relay/src/assignment/migrations/registered-migration-inventory.ts index 3d47ad31732..f18dd261163 100644 --- a/cloud/apps/relay/src/registered-migration-inventory.ts +++ b/cloud/apps/relay/src/assignment/migrations/registered-migration-inventory.ts @@ -1,4 +1,4 @@ -import type { RelayDatabase, SqlRow } from './database.js' +import type { RelayDatabase, SqlRow } from '../../database/database.js' import { ABANDONED_REGISTERED_MIGRATION, REGISTERED_MIGRATION_ABANDON_MS diff --git a/cloud/apps/relay/src/drain-return-admission.test.ts b/cloud/apps/relay/src/assignment/public-admission/drain-return-admission.test.ts similarity index 100% rename from cloud/apps/relay/src/drain-return-admission.test.ts rename to cloud/apps/relay/src/assignment/public-admission/drain-return-admission.test.ts diff --git a/cloud/apps/relay/src/drain-return-admission.ts b/cloud/apps/relay/src/assignment/public-admission/drain-return-admission.ts similarity index 100% rename from cloud/apps/relay/src/drain-return-admission.ts rename to cloud/apps/relay/src/assignment/public-admission/drain-return-admission.ts diff --git a/cloud/apps/relay/src/public-assignment-admission.test.ts b/cloud/apps/relay/src/assignment/public-admission/public-assignment-admission.test.ts similarity index 100% rename from cloud/apps/relay/src/public-assignment-admission.test.ts rename to cloud/apps/relay/src/assignment/public-admission/public-assignment-admission.test.ts diff --git a/cloud/apps/relay/src/public-assignment-admission.ts b/cloud/apps/relay/src/assignment/public-admission/public-assignment-admission.ts similarity index 100% rename from cloud/apps/relay/src/public-assignment-admission.ts rename to cloud/apps/relay/src/assignment/public-admission/public-assignment-admission.ts diff --git a/cloud/apps/relay/src/public-assignment-circuit-breaker.test.ts b/cloud/apps/relay/src/assignment/public-admission/public-assignment-circuit-breaker.test.ts similarity index 95% rename from cloud/apps/relay/src/public-assignment-circuit-breaker.test.ts rename to cloud/apps/relay/src/assignment/public-admission/public-assignment-circuit-breaker.test.ts index 94be0536497..b780bc26bd9 100644 --- a/cloud/apps/relay/src/public-assignment-circuit-breaker.test.ts +++ b/cloud/apps/relay/src/assignment/public-admission/public-assignment-circuit-breaker.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest' -import { createRelayApp } from './app.js' -import type { RelayConfig } from './config.js' +import { createRelayApp } from '../../app.js' +import type { RelayConfig } from '../../config.js' describe('public assignment circuit breaker', () => { it('rejects assign and resolve without invoking relay state', async () => { diff --git a/cloud/apps/relay/src/public-assignment-drain-return-lane.test.ts b/cloud/apps/relay/src/assignment/public-admission/public-assignment-drain-return-lane.test.ts similarity index 98% rename from cloud/apps/relay/src/public-assignment-drain-return-lane.test.ts rename to cloud/apps/relay/src/assignment/public-admission/public-assignment-drain-return-lane.test.ts index f8677928a53..8fd8f189841 100644 --- a/cloud/apps/relay/src/public-assignment-drain-return-lane.test.ts +++ b/cloud/apps/relay/src/assignment/public-admission/public-assignment-drain-return-lane.test.ts @@ -3,8 +3,8 @@ import { RelayAssignmentRowBusyError, type RelayAssignment, type ResolvedRelayAssignment -} from './assignment/assignment-store.js' -import type { RelayConfig } from './config.js' +} from '../assignment-store.js' +import type { RelayConfig } from '../../config.js' const fakes = vi.hoisted(() => ({ verifyRelayToken: vi.fn(async (token: string) => ({ @@ -13,12 +13,12 @@ const fakes = vi.hoisted(() => ({ })) })) -vi.mock('./relay-token-verifier.js', () => ({ +vi.mock('../../authentication/relay-token-verifier.js', () => ({ createRelayTokenVerifier: () => fakes.verifyRelayToken, readBearer: (value: string | undefined) => value?.replace(/^Bearer /, '') ?? null })) -import { createRelayApp } from './app.js' +import { createRelayApp } from '../../app.js' afterEach(() => { vi.useRealTimers() diff --git a/cloud/apps/relay/src/public-assignment-overload.test.ts b/cloud/apps/relay/src/assignment/public-admission/public-assignment-overload.test.ts similarity index 97% rename from cloud/apps/relay/src/public-assignment-overload.test.ts rename to cloud/apps/relay/src/assignment/public-admission/public-assignment-overload.test.ts index 966d2d491a4..3bb6d9790bf 100644 --- a/cloud/apps/relay/src/public-assignment-overload.test.ts +++ b/cloud/apps/relay/src/assignment/public-admission/public-assignment-overload.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest' -import type { RelayAssignment } from './assignment/assignment-store.js' -import type { RelayConfig } from './config.js' +import type { RelayAssignment } from '../assignment-store.js' +import type { RelayConfig } from '../../config.js' const fakes = vi.hoisted(() => ({ verifyRelayToken: vi.fn(async (token: string) => ({ @@ -9,12 +9,12 @@ const fakes = vi.hoisted(() => ({ })) })) -vi.mock('./relay-token-verifier.js', () => ({ +vi.mock('../../authentication/relay-token-verifier.js', () => ({ createRelayTokenVerifier: () => fakes.verifyRelayToken, readBearer: (value: string | undefined) => value?.replace(/^Bearer /, '') ?? null })) -import { createRelayApp } from './app.js' +import { createRelayApp } from '../../app.js' describe('public assignment overload', () => { it('rejects duplicate and excess work before it reaches assignment state', async () => { diff --git a/cloud/apps/relay/src/public-assignment-reconnect-lane.test.ts b/cloud/apps/relay/src/assignment/public-admission/public-assignment-reconnect-lane.test.ts similarity index 97% rename from cloud/apps/relay/src/public-assignment-reconnect-lane.test.ts rename to cloud/apps/relay/src/assignment/public-admission/public-assignment-reconnect-lane.test.ts index 3b5b49055c6..58245e0d8c2 100644 --- a/cloud/apps/relay/src/public-assignment-reconnect-lane.test.ts +++ b/cloud/apps/relay/src/assignment/public-admission/public-assignment-reconnect-lane.test.ts @@ -1,6 +1,6 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import { RelayAssignmentRowBusyError, type RelayAssignment } from './assignment/assignment-store.js' -import type { RelayConfig } from './config.js' +import { RelayAssignmentRowBusyError, type RelayAssignment } from '../assignment-store.js' +import type { RelayConfig } from '../../config.js' const fakes = vi.hoisted(() => ({ verifyRelayToken: vi.fn(async (token: string) => ({ @@ -9,12 +9,12 @@ const fakes = vi.hoisted(() => ({ })) })) -vi.mock('./relay-token-verifier.js', () => ({ +vi.mock('../../authentication/relay-token-verifier.js', () => ({ createRelayTokenVerifier: () => fakes.verifyRelayToken, readBearer: (value: string | undefined) => value?.replace(/^Bearer /, '') ?? null })) -import { createRelayApp } from './app.js' +import { createRelayApp } from '../../app.js' describe('public assignment reconnect lane', () => { afterEach(() => { diff --git a/cloud/apps/relay/src/idle-regional-rehome-reconciliation.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-reconciliation.test.ts similarity index 97% rename from cloud/apps/relay/src/idle-regional-rehome-reconciliation.test.ts rename to cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-reconciliation.test.ts index dc5fefb3356..f7b14a47a91 100644 --- a/cloud/apps/relay/src/idle-regional-rehome-reconciliation.test.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-reconciliation.test.ts @@ -1,6 +1,6 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { RelayDatabase } from './database.js' +import { RelayAssignmentStore } from '../assignment-store.js' +import type { RelayDatabase } from '../../database/database.js' import { openIdleRehomeTestDatabase } from './idle-regional-rehome-test-database.js' const request = { diff --git a/cloud/apps/relay/src/idle-regional-rehome-selection.ts b/cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-selection.ts similarity index 99% rename from cloud/apps/relay/src/idle-regional-rehome-selection.ts rename to cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-selection.ts index 28669376256..7d98ab538d2 100644 --- a/cloud/apps/relay/src/idle-regional-rehome-selection.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-selection.ts @@ -1,6 +1,6 @@ import { createHash } from 'node:crypto' -import type { IdleRegionalRehomeRequest } from '@orca-cloud/relay-contract' -import type { RelayDatabase, SqlRow } from './database.js' +import type { IdleRegionalRehomeRequest } from '@orca-cloud/relay-contract/idle-regional-rehome' +import type { RelayDatabase, SqlRow } from '../../database/database.js' export const IDLE_REHOME_PAGE_SIZE = 100 diff --git a/cloud/apps/relay/src/idle-regional-rehome-store.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-store.test.ts similarity index 99% rename from cloud/apps/relay/src/idle-regional-rehome-store.test.ts rename to cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-store.test.ts index 8d019cb1bfc..85193e2a108 100644 --- a/cloud/apps/relay/src/idle-regional-rehome-store.test.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-store.test.ts @@ -1,6 +1,6 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { RelayDatabase, RelayLockOptions } from './database.js' +import { RelayAssignmentStore } from '../assignment-store.js' +import type { RelayDatabase, RelayLockOptions } from '../../database/database.js' import { openIdleRehomeTestDatabase } from './idle-regional-rehome-test-database.js' const identity = { userId: 'idle-store-test', relayHostId: 'abcdefghijklmnop' } diff --git a/cloud/apps/relay/src/idle-regional-rehome-test-database.ts b/cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-test-database.ts similarity index 96% rename from cloud/apps/relay/src/idle-regional-rehome-test-database.ts rename to cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-test-database.ts index a541e7d1126..4e798b2b524 100644 --- a/cloud/apps/relay/src/idle-regional-rehome-test-database.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-test-database.ts @@ -1,6 +1,6 @@ import { randomUUID } from 'node:crypto' import pg from 'pg' -import { openInMemoryRelayDatabase, openRelayDatabase, type RelayDatabase } from './database.js' +import { openInMemoryRelayDatabase, openRelayDatabase, type RelayDatabase } from '../../database/database.js' export async function openIdleRehomeTestDatabase(): Promise { const configured = process.env.ORCA_IDLE_REHOME_POSTGRES_URL diff --git a/cloud/apps/relay/src/idle-regional-rehome-window.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-window.test.ts similarity index 99% rename from cloud/apps/relay/src/idle-regional-rehome-window.test.ts rename to cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-window.test.ts index cc9972faa3c..4be57fd04bf 100644 --- a/cloud/apps/relay/src/idle-regional-rehome-window.test.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-window.test.ts @@ -1,6 +1,6 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { RelayDatabase } from './database.js' +import { RelayAssignmentStore } from '../assignment-store.js' +import type { RelayDatabase } from '../../database/database.js' import { openIdleRehomeTestDatabase } from './idle-regional-rehome-test-database.js' // One source cell and three targets, so a poll has to rank targets per host diff --git a/cloud/apps/relay/src/idle-regional-rehome-worker.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-worker.test.ts similarity index 95% rename from cloud/apps/relay/src/idle-regional-rehome-worker.test.ts rename to cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-worker.test.ts index 3653aec181b..ccee4e8bbd4 100644 --- a/cloud/apps/relay/src/idle-regional-rehome-worker.test.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/idle-regional-rehome-worker.test.ts @@ -1,7 +1,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import type { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { RelayConfig } from './config.js' -import type { RegionalRehomeSafetySnapshot } from './relay-observability.js' +import type { RelayAssignmentStore } from '../assignment-store.js' +import type { RelayConfig } from '../../config.js' +import type { RegionalRehomeSafetySnapshot } from '../../observability/relay-observability.js' import { startRegionalRehomeWorker } from './regional-rehome-worker.js' const candidate = { diff --git a/cloud/apps/relay/src/region-correction-outcomes.ts b/cloud/apps/relay/src/assignment/regional-rehome/region-correction-outcomes.ts similarity index 95% rename from cloud/apps/relay/src/region-correction-outcomes.ts rename to cloud/apps/relay/src/assignment/regional-rehome/region-correction-outcomes.ts index d3a6f8d3be3..ec892ed0b92 100644 --- a/cloud/apps/relay/src/region-correction-outcomes.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/region-correction-outcomes.ts @@ -1,4 +1,4 @@ -import type { RelayDatabase } from './database.js' +import type { RelayDatabase } from '../../database/database.js' export async function readRegionCorrectionOutcomes(database: RelayDatabase, now: number) { const rows = await database.query( diff --git a/cloud/apps/relay/src/region-correction-preview.ts b/cloud/apps/relay/src/assignment/regional-rehome/region-correction-preview.ts similarity index 98% rename from cloud/apps/relay/src/region-correction-preview.ts rename to cloud/apps/relay/src/assignment/regional-rehome/region-correction-preview.ts index cedf5fdc6a2..88b4d378043 100644 --- a/cloud/apps/relay/src/region-correction-preview.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/region-correction-preview.ts @@ -1,5 +1,5 @@ -import type { RelayDatabase, SqlRow } from './database.js' -import { REGIONAL_REHOME_DEFAULT_HOST_COOLDOWN_MS } from './database.js' +import type { RelayDatabase, SqlRow } from '../../database/database.js' +import { REGIONAL_REHOME_DEFAULT_HOST_COOLDOWN_MS } from '../../database/database.js' import { rehomeSourceRegionAllowed } from './idle-regional-rehome-selection.js' import { REGIONAL_REHOME_ABORT_REPORT_WINDOW_MS } from './regional-rehome-abort-reason.js' import { diff --git a/cloud/apps/relay/src/region-correction-restart.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/region-correction-restart.test.ts similarity index 97% rename from cloud/apps/relay/src/region-correction-restart.test.ts rename to cloud/apps/relay/src/assignment/regional-rehome/region-correction-restart.test.ts index 45f2667b4f5..b13e1b9d3a5 100644 --- a/cloud/apps/relay/src/region-correction-restart.test.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/region-correction-restart.test.ts @@ -2,8 +2,8 @@ import { mkdtemp, rm } from 'node:fs/promises' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import { openRelayDatabase, type RelayDatabase } from './database.js' +import { RelayAssignmentStore } from '../assignment-store.js' +import { openRelayDatabase, type RelayDatabase } from '../../database/database.js' const identity = { userId: 'restart-test-user', relayHostId: 'abcdefghijklmnop' } const paths: string[] = [] diff --git a/cloud/apps/relay/src/region-correction-state.ts b/cloud/apps/relay/src/assignment/regional-rehome/region-correction-state.ts similarity index 93% rename from cloud/apps/relay/src/region-correction-state.ts rename to cloud/apps/relay/src/assignment/regional-rehome/region-correction-state.ts index d60ef020696..d2b0111f1e5 100644 --- a/cloud/apps/relay/src/region-correction-state.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/region-correction-state.ts @@ -1,11 +1,8 @@ -import { relayHostLogDigest } from './relay-host-log-digest.js' -import { hostCohortBucket } from './host-cohort-bucket.js' -import type { - RegionCorrectionRequest, - RegionCorrectionResponse, - RelayRegion -} from '@orca-cloud/relay-contract' -import type { RelayDatabase } from './database.js' +import { relayHostLogDigest } from '../../observability/relay-host-log-digest.js' +import { hostCohortBucket } from '../host-cohort-bucket.js' +import type { RegionCorrectionRequest, RegionCorrectionResponse } from '@orca-cloud/relay-contract/region-correction' +import type { RelayRegion } from '@orca-cloud/relay-contract/relay-regions' +import type { RelayDatabase } from '../../database/database.js' type Identity = { userId: string; relayHostId: string } export const REGION_DECISION_TTL_MS = 24 * 60 * 60_000 diff --git a/cloud/apps/relay/src/region-correction-store.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/region-correction-store.test.ts similarity index 99% rename from cloud/apps/relay/src/region-correction-store.test.ts rename to cloud/apps/relay/src/assignment/regional-rehome/region-correction-store.test.ts index 88513b200c3..c73a052b1b7 100644 --- a/cloud/apps/relay/src/region-correction-store.test.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/region-correction-store.test.ts @@ -1,6 +1,6 @@ import { afterEach, describe, expect, it } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import { openInMemoryRelayDatabase, openRelayDatabase, type RelayDatabase } from './database.js' +import { RelayAssignmentStore } from '../assignment-store.js' +import { openInMemoryRelayDatabase, openRelayDatabase, type RelayDatabase } from '../../database/database.js' const identity = { userId: 'region-correction-test-user', relayHostId: 'abcdefghijklmnop' } const cells = [ diff --git a/cloud/apps/relay/src/regional-rehome-abort-reason.ts b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-abort-reason.ts similarity index 90% rename from cloud/apps/relay/src/regional-rehome-abort-reason.ts rename to cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-abort-reason.ts index ad7a1622b40..f60f75d610f 100644 --- a/cloud/apps/relay/src/regional-rehome-abort-reason.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-abort-reason.ts @@ -1,4 +1,4 @@ -import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract' +import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invariants' // Why an attempt was rolled back to its source. Attempts settled by the // migration-side abort paths, and every row aborted before the column existed, diff --git a/cloud/apps/relay/src/regional-rehome-constraint-migration-postgres.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-constraint-migration-postgres.test.ts similarity index 99% rename from cloud/apps/relay/src/regional-rehome-constraint-migration-postgres.test.ts rename to cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-constraint-migration-postgres.test.ts index 4e9ccda5e13..6dd56d46840 100644 --- a/cloud/apps/relay/src/regional-rehome-constraint-migration-postgres.test.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-constraint-migration-postgres.test.ts @@ -4,7 +4,7 @@ import { openRelayDatabase, REGIONAL_REHOME_DEFAULT_HOST_COOLDOWN_MS, type RelayDatabase -} from './database.js' +} from '../../database/database.js' const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL const describePostgres = databaseUrl ? describe : describe.skip diff --git a/cloud/apps/relay/src/regional-rehome-poll-telemetry.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-poll-telemetry.test.ts similarity index 100% rename from cloud/apps/relay/src/regional-rehome-poll-telemetry.test.ts rename to cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-poll-telemetry.test.ts diff --git a/cloud/apps/relay/src/regional-rehome-poll-telemetry.ts b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-poll-telemetry.ts similarity index 100% rename from cloud/apps/relay/src/regional-rehome-poll-telemetry.ts rename to cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-poll-telemetry.ts diff --git a/cloud/apps/relay/src/regional-rehome-postgres.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-postgres.test.ts similarity index 99% rename from cloud/apps/relay/src/regional-rehome-postgres.test.ts rename to cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-postgres.test.ts index eabbf6d2353..4972e0fcf55 100644 --- a/cloud/apps/relay/src/regional-rehome-postgres.test.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-postgres.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import { openRelayDatabase, type RelayDatabase } from './database.js' +import { RelayAssignmentStore } from '../assignment-store.js' +import { openRelayDatabase, type RelayDatabase } from '../../database/database.js' import { REGIONAL_REHOME_RECONNECTS_PER_CELL_LIMIT, REGIONAL_REHOME_SQL_FAILURES_LIMIT, diff --git a/cloud/apps/relay/src/regional-rehome-safety.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-safety.test.ts similarity index 100% rename from cloud/apps/relay/src/regional-rehome-safety.test.ts rename to cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-safety.test.ts diff --git a/cloud/apps/relay/src/regional-rehome-safety.ts b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-safety.ts similarity index 97% rename from cloud/apps/relay/src/regional-rehome-safety.ts rename to cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-safety.ts index 500fdd17a20..d6af539b767 100644 --- a/cloud/apps/relay/src/regional-rehome-safety.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-safety.ts @@ -1,4 +1,4 @@ -import type { RegionalRehomeSafetySnapshot } from './relay-observability.js' +import type { RegionalRehomeSafetySnapshot } from '../../observability/relay-observability.js' // Healthy-fleet peaks: 2 waiters/~1ms pool wait; ~80 reconnects per two-window row (2026-08-28). export const REGIONAL_REHOME_RECONNECTS_PER_CELL_LIMIT = 250 diff --git a/cloud/apps/relay/src/regional-rehome-source-region-filter.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-source-region-filter.test.ts similarity index 98% rename from cloud/apps/relay/src/regional-rehome-source-region-filter.test.ts rename to cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-source-region-filter.test.ts index a74eec9d3f8..a4a9a8cd359 100644 --- a/cloud/apps/relay/src/regional-rehome-source-region-filter.test.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-source-region-filter.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' +import { RelayAssignmentStore } from '../assignment-store.js' import { openIdleRehomeTestDatabase } from './idle-regional-rehome-test-database.js' type Region = 'us-central1' | 'asia-east2' diff --git a/cloud/apps/relay/src/regional-rehome-store.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-store.test.ts similarity index 99% rename from cloud/apps/relay/src/regional-rehome-store.test.ts rename to cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-store.test.ts index 585aed897f3..f7002f5e652 100644 --- a/cloud/apps/relay/src/regional-rehome-store.test.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-store.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest' -import { readAssignmentInventorySnapshot } from './assignment/assignment-inventory-snapshot.js' +import { readAssignmentInventorySnapshot } from '../assignment-inventory-snapshot.js' import { REGIONAL_REHOME_ARRIVAL_WINDOW_MS } from './regional-rehome-abort-reason.js' import { RelayAssignmentStore as BaseRelayAssignmentStore, @@ -7,19 +7,19 @@ import { REGIONAL_REHOME_QUARANTINE_FAILURES, REGIONAL_REHOME_QUARANTINE_MS, REGIONAL_REHOME_REDRAIN_SEND_LIMIT -} from './assignment/assignment-store.js' +} from '../assignment-store.js' import { openInMemoryRelayDatabase, type RelayDatabase, type RelayLockOptions, type SqlRow -} from './database.js' +} from '../../database/database.js' import { REGIONAL_REHOME_SQL_FAILURES_LIMIT, REGIONAL_REHOME_SQL_FAILURES_PER_CELL_LIMIT, REGIONAL_REHOME_SQL_FAILURES_SUSTAIN_MS } from './regional-rehome-safety.js' -import type { RegionalRehomeSafetySnapshot } from './relay-observability.js' +import type { RegionalRehomeSafetySnapshot } from '../../observability/relay-observability.js' const source = { id: 'us-c1', diff --git a/cloud/apps/relay/src/regional-rehome-target-row-lock-postgres.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-target-row-lock-postgres.test.ts similarity index 99% rename from cloud/apps/relay/src/regional-rehome-target-row-lock-postgres.test.ts rename to cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-target-row-lock-postgres.test.ts index 3edf0d2a919..0517a7c3cf6 100644 --- a/cloud/apps/relay/src/regional-rehome-target-row-lock-postgres.test.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-target-row-lock-postgres.test.ts @@ -1,16 +1,16 @@ import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' +import { RelayAssignmentStore } from '../assignment-store.js' import { consumeRelayCellInventoryHold, openRelayDatabase, type PostgresDatabase, type RelayDatabase -} from './database.js' +} from '../../database/database.js' import { readRegionCorrectionOutcomes } from './region-correction-outcomes.js' import { openDelayedPostgresDatabase, type StatementDelay -} from './test-fixtures/delayed-postgres-database.js' +} from '../../test-fixtures/delayed-postgres-database.js' const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL const describePostgres = databaseUrl ? describe : describe.skip diff --git a/cloud/apps/relay/src/regional-rehome-target-selection.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-target-selection.test.ts similarity index 97% rename from cloud/apps/relay/src/regional-rehome-target-selection.test.ts rename to cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-target-selection.test.ts index 0b3141aa635..75229b3cd4c 100644 --- a/cloud/apps/relay/src/regional-rehome-target-selection.test.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-target-selection.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import { openInMemoryRelayDatabase } from './database.js' +import { RelayAssignmentStore } from '../assignment-store.js' +import { openInMemoryRelayDatabase } from '../../database/database.js' import { REGIONAL_REHOME_SQL_FAILURES_PER_CELL_LIMIT } from './regional-rehome-safety.js' const cell = (id: string, region: 'us-central1' | 'asia-east2') => ({ diff --git a/cloud/apps/relay/src/regional-rehome-trust-probe.ts b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-trust-probe.ts similarity index 100% rename from cloud/apps/relay/src/regional-rehome-trust-probe.ts rename to cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-trust-probe.ts diff --git a/cloud/apps/relay/src/regional-rehome-worker.test.ts b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-worker.test.ts similarity index 97% rename from cloud/apps/relay/src/regional-rehome-worker.test.ts rename to cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-worker.test.ts index 6ac2174b97d..3bb0b621dc9 100644 --- a/cloud/apps/relay/src/regional-rehome-worker.test.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-worker.test.ts @@ -1,6 +1,6 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import type { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { RelayConfig } from './config.js' +import type { RelayAssignmentStore } from '../assignment-store.js' +import type { RelayConfig } from '../../config.js' import { startRegionalRehomeWorker } from './regional-rehome-worker.js' describe('regional rehome worker', () => { diff --git a/cloud/apps/relay/src/regional-rehome-worker.ts b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-worker.ts similarity index 89% rename from cloud/apps/relay/src/regional-rehome-worker.ts rename to cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-worker.ts index d6590f0f544..df7e5ea6e48 100644 --- a/cloud/apps/relay/src/regional-rehome-worker.ts +++ b/cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-worker.ts @@ -1,12 +1,9 @@ -import { - IdleRegionalRehomeResponseSchema, - isGlobalIdleRegionalRehomeDeferral -} from '@orca-cloud/relay-contract' -import type { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { RelayConfig } from './config.js' -import { googleMetadataIdentityToken } from './google-metadata-identity-token.js' -import type { RegionalRehomeSafetySnapshot } from './relay-observability.js' -import { jitteredSweepIntervalMs } from './relay-sweep-schedule.js' +import { IdleRegionalRehomeResponseSchema, isGlobalIdleRegionalRehomeDeferral } from '@orca-cloud/relay-contract/idle-regional-rehome' +import type { RelayAssignmentStore } from '../assignment-store.js' +import type { RelayConfig } from '../../config.js' +import { googleMetadataIdentityToken } from '../../authentication/google-metadata-identity-token.js' +import type { RegionalRehomeSafetySnapshot } from '../../observability/relay-observability.js' +import { jitteredSweepIntervalMs } from '../../process-lifecycle/relay-sweep-schedule.js' type RegionalRehomeWorkerOptions = { fetch?: typeof fetch diff --git a/cloud/apps/relay/src/relay-region-placement.test.ts b/cloud/apps/relay/src/assignment/relay-region-placement.test.ts similarity index 97% rename from cloud/apps/relay/src/relay-region-placement.test.ts rename to cloud/apps/relay/src/assignment/relay-region-placement.test.ts index d00b4a05fb1..25873f15666 100644 --- a/cloud/apps/relay/src/relay-region-placement.test.ts +++ b/cloud/apps/relay/src/assignment/relay-region-placement.test.ts @@ -1,8 +1,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { RelayAssignmentStore, type RelayAssignment } from './assignment/assignment-store.js' -import type { RelayCellConfig } from './config.js' -import { openInMemoryRelayDatabase, type RelayDatabase } from './database.js' -import { ReservePaceError } from './reserve-assignment.js' +import { RelayAssignmentStore, type RelayAssignment } from './assignment-store.js' +import type { RelayCellConfig } from '../config.js' +import { openInMemoryRelayDatabase, type RelayDatabase } from '../database/database.js' +import { ReservePaceError } from './reserve-placement/reserve-assignment.js' const CELLS: RelayCellConfig[] = [ { diff --git a/cloud/apps/relay/src/placement-load-band.test.ts b/cloud/apps/relay/src/assignment/reserve-placement/placement-load-band.test.ts similarity index 97% rename from cloud/apps/relay/src/placement-load-band.test.ts rename to cloud/apps/relay/src/assignment/reserve-placement/placement-load-band.test.ts index ea0c62eff00..a1ca010f8bf 100644 --- a/cloud/apps/relay/src/placement-load-band.test.ts +++ b/cloud/apps/relay/src/assignment/reserve-placement/placement-load-band.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from 'vitest' import { PLACEMENT_INTAKE_SHARE, PlacementLoadBand } from './placement-load-band.js' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import { openInMemoryRelayDatabase } from './database.js' +import { RelayAssignmentStore } from '../assignment-store.js' +import { openInMemoryRelayDatabase } from '../../database/database.js' function seededRandom(seed: number): () => number { let state = seed >>> 0 diff --git a/cloud/apps/relay/src/placement-load-band.ts b/cloud/apps/relay/src/assignment/reserve-placement/placement-load-band.ts similarity index 100% rename from cloud/apps/relay/src/placement-load-band.ts rename to cloud/apps/relay/src/assignment/reserve-placement/placement-load-band.ts diff --git a/cloud/apps/relay/src/reserve-assignment.test.ts b/cloud/apps/relay/src/assignment/reserve-placement/reserve-assignment.test.ts similarity index 99% rename from cloud/apps/relay/src/reserve-assignment.test.ts rename to cloud/apps/relay/src/assignment/reserve-placement/reserve-assignment.test.ts index 2472e1c2c7c..ebbf4b8b1b5 100644 --- a/cloud/apps/relay/src/reserve-assignment.test.ts +++ b/cloud/apps/relay/src/assignment/reserve-placement/reserve-assignment.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest' -import type { RelayRegion } from '@orca-cloud/relay-contract' -import type { CellReserveClient } from './cell-reserve-client.js' +import type { RelayRegion } from '@orca-cloud/relay-contract/relay-regions' +import type { CellReserveClient } from '../../cell/reservations/cell-reserve-client.js' import { ReserveAssignment, ReservePaceError, @@ -10,7 +10,7 @@ import { } from './reserve-assignment.js' import { ReservePlacer, type ReserveAttempt } from './reserve-placement.js' import { ReserveRehome } from './reserve-rehome.js' -import { ShadowSeatDirectory, type SeatFeedCell, type SeatFeedResponse } from './shadow-seat-directory.js' +import { ShadowSeatDirectory, type SeatFeedCell, type SeatFeedResponse } from '../../cell/seats/shadow-seat-directory.js' const HOST = { userId: 'user-1', relayHostId: 'abcdefghijklmnop' } const US = 'us-central1' as const diff --git a/cloud/apps/relay/src/reserve-assignment.ts b/cloud/apps/relay/src/assignment/reserve-placement/reserve-assignment.ts similarity index 98% rename from cloud/apps/relay/src/reserve-assignment.ts rename to cloud/apps/relay/src/assignment/reserve-placement/reserve-assignment.ts index ed729803975..2315ff10de1 100644 --- a/cloud/apps/relay/src/reserve-assignment.ts +++ b/cloud/apps/relay/src/assignment/reserve-placement/reserve-assignment.ts @@ -1,21 +1,17 @@ -import { - ASSIGNMENT_LIMITS, - RELAY_CLOSE_CODE, - RELAY_DEFAULT_REGION, - RELAY_REGIONS, - type RelayRegion -} from '@orca-cloud/relay-contract' -import type { AssignOptions, RelayAssignment } from './assignment/assignment-store.js' -import { CELL_RESERVE_TTL_MS } from './cell-reserve-contract.js' -import type { CellReserveClient } from './cell-reserve-client.js' -import { relayHostLogDigest } from './relay-host-log-digest.js' +import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invariants' +import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes' +import { RELAY_DEFAULT_REGION, RELAY_REGIONS, type RelayRegion } from '@orca-cloud/relay-contract/relay-regions' +import type { AssignOptions, RelayAssignment } from '../assignment-store.js' +import { CELL_RESERVE_TTL_MS } from '../../cell/reservations/cell-reserve-contract.js' +import type { CellReserveClient } from '../../cell/reservations/cell-reserve-client.js' +import { relayHostLogDigest } from '../../observability/relay-host-log-digest.js' import type { RehomeSkip, RehomeTargetRoom, ReserveRehome } from './reserve-rehome.js' import { mintEpoch, type PlacementCell, type ReservePlacer } from './reserve-placement.js' -import type { OutrankedSeat, SeatFeedCell, ShadowSeat, ShadowSeatDirectory } from './shadow-seat-directory.js' +import type { OutrankedSeat, SeatFeedCell, ShadowSeat, ShadowSeatDirectory } from '../../cell/seats/shadow-seat-directory.js' // Director estimates/picks from its memory map, but the cell decides every booking; other hosts retain database placement. diff --git a/cloud/apps/relay/src/reserve-ledger-writer-postgres.test.ts b/cloud/apps/relay/src/assignment/reserve-placement/reserve-ledger-writer-postgres.test.ts similarity index 96% rename from cloud/apps/relay/src/reserve-ledger-writer-postgres.test.ts rename to cloud/apps/relay/src/assignment/reserve-placement/reserve-ledger-writer-postgres.test.ts index 6dfbff9d8ac..dbcd724faf1 100644 --- a/cloud/apps/relay/src/reserve-ledger-writer-postgres.test.ts +++ b/cloud/apps/relay/src/assignment/reserve-placement/reserve-ledger-writer-postgres.test.ts @@ -1,6 +1,6 @@ import { randomUUID } from 'node:crypto' import { afterAll, beforeAll, describe, expect, it } from 'vitest' -import { openRelayDatabase, type RelayDatabase } from './database.js' +import { openRelayDatabase, type RelayDatabase } from '../../database/database.js' import { reconcileReserveLedger, ReserveLedgerWriter } from './reserve-ledger-writer.js' diff --git a/cloud/apps/relay/src/reserve-ledger-writer.test.ts b/cloud/apps/relay/src/assignment/reserve-placement/reserve-ledger-writer.test.ts similarity index 99% rename from cloud/apps/relay/src/reserve-ledger-writer.test.ts rename to cloud/apps/relay/src/assignment/reserve-placement/reserve-ledger-writer.test.ts index 8f17bb40835..88f3b5875c4 100644 --- a/cloud/apps/relay/src/reserve-ledger-writer.test.ts +++ b/cloud/apps/relay/src/assignment/reserve-placement/reserve-ledger-writer.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import { openInMemoryRelayDatabase, type RelayDatabase } from './database.js' +import { openInMemoryRelayDatabase, type RelayDatabase } from '../../database/database.js' import { reconcileReserveLedger, ReserveLedgerWriter } from './reserve-ledger-writer.js' const HOST = { userId: 'user-1', relayHostId: 'abcdefghijklmnop' } diff --git a/cloud/apps/relay/src/reserve-ledger-writer.ts b/cloud/apps/relay/src/assignment/reserve-placement/reserve-ledger-writer.ts similarity index 99% rename from cloud/apps/relay/src/reserve-ledger-writer.ts rename to cloud/apps/relay/src/assignment/reserve-placement/reserve-ledger-writer.ts index 3aa59452cae..5340c779346 100644 --- a/cloud/apps/relay/src/reserve-ledger-writer.ts +++ b/cloud/apps/relay/src/assignment/reserve-placement/reserve-ledger-writer.ts @@ -1,4 +1,4 @@ -import type { RelayDatabase } from './database.js' +import type { RelayDatabase } from '../../database/database.js' // Mirror booked joins to relay_assignments after admission; desktop correctness never reads this record. // Only higher epochs replace rows. Cell moves reset counters but leave leases/unbacked units on the old cell until reconcile, conservatively overstating load. diff --git a/cloud/apps/relay/src/reserve-placement-simulation.test.ts b/cloud/apps/relay/src/assignment/reserve-placement/reserve-placement-simulation.test.ts similarity index 100% rename from cloud/apps/relay/src/reserve-placement-simulation.test.ts rename to cloud/apps/relay/src/assignment/reserve-placement/reserve-placement-simulation.test.ts diff --git a/cloud/apps/relay/src/reserve-placement-simulation.ts b/cloud/apps/relay/src/assignment/reserve-placement/reserve-placement-simulation.ts similarity index 99% rename from cloud/apps/relay/src/reserve-placement-simulation.ts rename to cloud/apps/relay/src/assignment/reserve-placement/reserve-placement-simulation.ts index b7d84f75508..f39811009ec 100644 --- a/cloud/apps/relay/src/reserve-placement-simulation.ts +++ b/cloud/apps/relay/src/assignment/reserve-placement/reserve-placement-simulation.ts @@ -1,7 +1,8 @@ import { createHash } from 'node:crypto' -import { RELAY_PROTOCOL_LIMITS, type RelayRegion } from '@orca-cloud/relay-contract' -import { CellReserveBook } from './cell-reserve-book.js' -import { CELL_INTAKE_BURST, CELL_RESERVE_TTL_MS, type ReserveOutcome } from './cell-reserve-contract.js' +import { RELAY_PROTOCOL_LIMITS } from '@orca-cloud/relay-contract/protocol-limits' +import type { RelayRegion } from '@orca-cloud/relay-contract/relay-regions' +import { CellReserveBook } from '../../cell/reservations/cell-reserve-book.js' +import { CELL_INTAKE_BURST, CELL_RESERVE_TTL_MS, type ReserveOutcome } from '../../cell/reservations/cell-reserve-contract.js' import { mintEpoch, RESERVE_CELL_FRESH_MS, @@ -9,7 +10,7 @@ import { ReservePlacer, type PlacementCell } from './reserve-placement.js' -import { seatOutranks } from './shadow-seat-directory.js' +import { seatOutranks } from '../../cell/seats/shadow-seat-directory.js' // Seeded event model uses real CellReserveBook/ReservePlacer; sockets, DB and desktops are modeled. // Record invariant violations without throwing so each run exposes every class it hits. diff --git a/cloud/apps/relay/src/reserve-placement.test.ts b/cloud/apps/relay/src/assignment/reserve-placement/reserve-placement.test.ts similarity index 100% rename from cloud/apps/relay/src/reserve-placement.test.ts rename to cloud/apps/relay/src/assignment/reserve-placement/reserve-placement.test.ts diff --git a/cloud/apps/relay/src/reserve-placement.ts b/cloud/apps/relay/src/assignment/reserve-placement/reserve-placement.ts similarity index 98% rename from cloud/apps/relay/src/reserve-placement.ts rename to cloud/apps/relay/src/assignment/reserve-placement/reserve-placement.ts index 5caf3fad5f0..f49c6f73591 100644 --- a/cloud/apps/relay/src/reserve-placement.ts +++ b/cloud/apps/relay/src/assignment/reserve-placement/reserve-placement.ts @@ -1,5 +1,5 @@ -import type { RelayRegion } from '@orca-cloud/relay-contract' -import { CELL_INTAKE_BURST, CELL_RESERVE_TTL_MS, type ReserveOutcome } from './cell-reserve-contract.js' +import type { RelayRegion } from '@orca-cloud/relay-contract/relay-regions' +import { CELL_INTAKE_BURST, CELL_RESERVE_TTL_MS, type ReserveOutcome } from '../../cell/reservations/cell-reserve-contract.js' // Directors estimate/pick from their own maps; cells decide bookings. Simulation drives this same pure logic. diff --git a/cloud/apps/relay/src/reserve-rehome.test.ts b/cloud/apps/relay/src/assignment/reserve-placement/reserve-rehome.test.ts similarity index 96% rename from cloud/apps/relay/src/reserve-rehome.test.ts rename to cloud/apps/relay/src/assignment/reserve-placement/reserve-rehome.test.ts index bf1a57a32b5..1678270f14d 100644 --- a/cloud/apps/relay/src/reserve-rehome.test.ts +++ b/cloud/apps/relay/src/assignment/reserve-placement/reserve-rehome.test.ts @@ -1,7 +1,7 @@ -import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract' +import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes' import { describe, expect, it } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import { openInMemoryRelayDatabase } from './database.js' +import { RelayAssignmentStore } from '../assignment-store.js' +import { openInMemoryRelayDatabase } from '../../database/database.js' import { RESERVE_REHOME_HOST_COOLDOWN_MS, RESERVE_REHOME_SWITCH_STALE_MS, diff --git a/cloud/apps/relay/src/reserve-rehome.ts b/cloud/apps/relay/src/assignment/reserve-placement/reserve-rehome.ts similarity index 96% rename from cloud/apps/relay/src/reserve-rehome.ts rename to cloud/apps/relay/src/assignment/reserve-placement/reserve-rehome.ts index 2b9e19c68c1..78d2bf38a2e 100644 --- a/cloud/apps/relay/src/reserve-rehome.ts +++ b/cloud/apps/relay/src/assignment/reserve-placement/reserve-rehome.ts @@ -1,5 +1,6 @@ -import { RELAY_CLOSE_CODE, type RelayRegion } from '@orca-cloud/relay-contract' -import { hostCohortBucket } from './host-cohort-bucket.js' +import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes' +import type { RelayRegion } from '@orca-cloud/relay-contract/relay-regions' +import { hostCohortBucket } from '../host-cohort-bucket.js' // Rehome only on an existing reconnect outside the requested region; failed rules retain sticky answer, never force disconnect/503. diff --git a/cloud/apps/relay/src/reserve-spill-fleet.test.ts b/cloud/apps/relay/src/assignment/reserve-placement/reserve-spill-fleet.test.ts similarity index 91% rename from cloud/apps/relay/src/reserve-spill-fleet.test.ts rename to cloud/apps/relay/src/assignment/reserve-placement/reserve-spill-fleet.test.ts index a714303f4e1..850d977491b 100644 --- a/cloud/apps/relay/src/reserve-spill-fleet.test.ts +++ b/cloud/apps/relay/src/assignment/reserve-placement/reserve-spill-fleet.test.ts @@ -1,23 +1,23 @@ -import type { RelayRegion } from '@orca-cloud/relay-contract' +import type { RelayRegion } from '@orca-cloud/relay-contract/relay-regions' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { CellReserveClient } from './cell-reserve-client.js' -import type { RelayCellConfig, RelayConfig } from './config.js' -import { openInMemoryRelayDatabase, type RelayDatabase } from './database.js' +import { RelayAssignmentStore } from '../assignment-store.js' +import type { CellReserveClient } from '../../cell/reservations/cell-reserve-client.js' +import type { RelayCellConfig, RelayConfig } from '../../config.js' +import { openInMemoryRelayDatabase, type RelayDatabase } from '../../database/database.js' import { ReserveAssignment } from './reserve-assignment.js' import { ReservePlacer } from './reserve-placement.js' -import { ShadowSeatDirectory, type SeatFeedCell } from './shadow-seat-directory.js' +import { ShadowSeatDirectory, type SeatFeedCell } from '../../cell/seats/shadow-seat-directory.js' const fakes = vi.hoisted(() => ({ verifyRelayToken: vi.fn(async (token: string) => ({ sub: 'user-1', relayHostId: token })) })) -vi.mock('./relay-token-verifier.js', () => ({ +vi.mock('../../authentication/relay-token-verifier.js', () => ({ createRelayTokenVerifier: () => fakes.verifyRelayToken, readBearer: (value: string | undefined) => value?.replace(/^Bearer /, '') ?? null })) -import { createRelayApp } from './app.js' +import { createRelayApp } from '../../app.js' // Exercise real /v1/assign plan/store with no database-mode cells; booking fakes enforce two seats per cell. diff --git a/cloud/apps/relay/src/admin-token-verifier.test.ts b/cloud/apps/relay/src/authentication/admin-token-verifier.test.ts similarity index 100% rename from cloud/apps/relay/src/admin-token-verifier.test.ts rename to cloud/apps/relay/src/authentication/admin-token-verifier.test.ts diff --git a/cloud/apps/relay/src/admin-token-verifier.ts b/cloud/apps/relay/src/authentication/admin-token-verifier.ts similarity index 99% rename from cloud/apps/relay/src/admin-token-verifier.ts rename to cloud/apps/relay/src/authentication/admin-token-verifier.ts index badb65d797b..38cf065d3b7 100644 --- a/cloud/apps/relay/src/admin-token-verifier.ts +++ b/cloud/apps/relay/src/authentication/admin-token-verifier.ts @@ -1,5 +1,5 @@ import { createRemoteJWKSet, jwtVerify } from 'jose' -import type { RelayConfig } from './config.js' +import type { RelayConfig } from '../config.js' export const RELAY_MONITOR_ADMIN_ROUTES = [ '/v1/admin/admission-selector/status', diff --git a/cloud/apps/relay/src/google-metadata-identity-token.ts b/cloud/apps/relay/src/authentication/google-metadata-identity-token.ts similarity index 100% rename from cloud/apps/relay/src/google-metadata-identity-token.ts rename to cloud/apps/relay/src/authentication/google-metadata-identity-token.ts diff --git a/cloud/apps/relay/src/relay-token-verifier.ts b/cloud/apps/relay/src/authentication/relay-token-verifier.ts similarity index 95% rename from cloud/apps/relay/src/relay-token-verifier.ts rename to cloud/apps/relay/src/authentication/relay-token-verifier.ts index 42dccce9297..da8c36ea35f 100644 --- a/cloud/apps/relay/src/relay-token-verifier.ts +++ b/cloud/apps/relay/src/authentication/relay-token-verifier.ts @@ -1,6 +1,6 @@ import { jwtVerify, type JWTVerifyGetKey } from 'jose' import { z } from 'zod' -import type { RelayConfig } from './config.js' +import type { RelayConfig } from '../config.js' import { createStaleIfErrorJWKSet } from './stale-if-error-jwks.js' const ClaimsSchema = z.object({ diff --git a/cloud/apps/relay/src/stale-if-error-jwks.test.ts b/cloud/apps/relay/src/authentication/stale-if-error-jwks.test.ts similarity index 99% rename from cloud/apps/relay/src/stale-if-error-jwks.test.ts rename to cloud/apps/relay/src/authentication/stale-if-error-jwks.test.ts index 26177e4d826..e8203bac42b 100644 --- a/cloud/apps/relay/src/stale-if-error-jwks.test.ts +++ b/cloud/apps/relay/src/authentication/stale-if-error-jwks.test.ts @@ -1,6 +1,6 @@ import { exportJWK, generateKeyPair, SignJWT, type CryptoKey, type JWK } from 'jose' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type { RelayConfig } from './config.js' +import type { RelayConfig } from '../config.js' import { createRelayTokenVerifier } from './relay-token-verifier.js' import { createStaleIfErrorJWKSet, RELAY_JWKS_MAX_STALE_MS } from './stale-if-error-jwks.js' diff --git a/cloud/apps/relay/src/stale-if-error-jwks.ts b/cloud/apps/relay/src/authentication/stale-if-error-jwks.ts similarity index 100% rename from cloud/apps/relay/src/stale-if-error-jwks.ts rename to cloud/apps/relay/src/authentication/stale-if-error-jwks.ts diff --git a/cloud/apps/relay/src/cell-status-reserve-view.test.ts b/cloud/apps/relay/src/cell-status-reserve-view.test.ts index 743faf0c61c..e554c245818 100644 --- a/cloud/apps/relay/src/cell-status-reserve-view.test.ts +++ b/cloud/apps/relay/src/cell-status-reserve-view.test.ts @@ -1,7 +1,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest' import type { RelayConfig } from './config.js' -vi.mock('./admin-token-verifier.js', () => ({ +vi.mock('./authentication/admin-token-verifier.js', () => ({ createAdminTokenVerifier: () => async (token: string) => token === 'deploy-token', createReadOnlyAdminTokenVerifier: () => async () => false, createRegionalRehomeControlApplyTokenVerifier: () => async () => false, @@ -10,22 +10,22 @@ vi.mock('./admin-token-verifier.js', () => ({ createRuntimeTokenVerifier: () => async () => false })) -vi.mock('./relay-token-verifier.js', () => ({ +vi.mock('./authentication/relay-token-verifier.js', () => ({ createRelayTokenVerifier: () => async () => null, readBearer: (value: string | undefined) => value?.replace(/^Bearer /, '') ?? null })) import { createRelayApp } from './app.js' import { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { CellReserveClient } from './cell-reserve-client.js' -import { openInMemoryRelayDatabase, type RelayDatabase } from './database.js' -import { ReserveAssignment, type ReservePlacementMode } from './reserve-assignment.js' -import { ReservePlacer } from './reserve-placement.js' +import type { CellReserveClient } from './cell/reservations/cell-reserve-client.js' +import { openInMemoryRelayDatabase, type RelayDatabase } from './database/database.js' +import { ReserveAssignment, type ReservePlacementMode } from './assignment/reserve-placement/reserve-assignment.js' +import { ReservePlacer } from './assignment/reserve-placement/reserve-placement.js' import { ShadowSeatDirectory, type SeatFeedCell, type SeatFeedResponse -} from './shadow-seat-directory.js' +} from './cell/seats/shadow-seat-directory.js' const INCARNATION = '11111111-1111-4111-8111-111111111111' const CELLS = [ diff --git a/cloud/apps/relay/src/cell-admission-migration-registration.ts b/cloud/apps/relay/src/cell/admission/cell-admission-migration-registration.ts similarity index 97% rename from cloud/apps/relay/src/cell-admission-migration-registration.ts rename to cloud/apps/relay/src/cell/admission/cell-admission-migration-registration.ts index a6cd356a42b..2b91284e269 100644 --- a/cloud/apps/relay/src/cell-admission-migration-registration.ts +++ b/cloud/apps/relay/src/cell/admission/cell-admission-migration-registration.ts @@ -1,11 +1,5 @@ -import { - isRelayCellConnectionHardCap, - RELAY_DEFAULT_REGION, - RELAY_REGIONS, - relayCellAdmissionBounds, - type RelayCellConnectionHardCap, - type RelayRegion -} from '@orca-cloud/relay-contract' +import { isRelayCellConnectionHardCap, relayCellAdmissionBounds, type RelayCellConnectionHardCap } from '@orca-cloud/relay-contract/admission-budgets' +import { RELAY_DEFAULT_REGION, RELAY_REGIONS, type RelayRegion } from '@orca-cloud/relay-contract/relay-regions' import { decodeMembership, encodeMembership, @@ -15,7 +9,7 @@ import { type CellAdmissionMembership, type CellAdmissionSelector } from './cell-admission-selector.js' -import type { RelayDatabase, SqlRow } from './database.js' +import type { RelayDatabase, SqlRow } from '../../database/database.js' export type MigrationCellRegistration = { id: string diff --git a/cloud/apps/relay/src/cell-admission-selector.test.ts b/cloud/apps/relay/src/cell/admission/cell-admission-selector.test.ts similarity index 98% rename from cloud/apps/relay/src/cell-admission-selector.test.ts rename to cloud/apps/relay/src/cell/admission/cell-admission-selector.test.ts index ea394deb611..0a0e191258f 100644 --- a/cloud/apps/relay/src/cell-admission-selector.test.ts +++ b/cloud/apps/relay/src/cell/admission/cell-admission-selector.test.ts @@ -1,14 +1,14 @@ -import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract' +import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invariants' import { createHash } from 'node:crypto' import { afterEach, describe, expect, it } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' +import { RelayAssignmentStore } from '../../assignment/assignment-store.js' import { encodeMembership } from './cell-admission-selector.js' import { openInMemoryRelayDatabase, type RelayDatabase, type RelayLockOptions, type SqlRow -} from './database.js' +} from '../../database/database.js' const CELLS = [ { id: 'c1', url: 'https://c1.example.com', capacityRequests: 20 }, diff --git a/cloud/apps/relay/src/cell-admission-selector.ts b/cloud/apps/relay/src/cell/admission/cell-admission-selector.ts similarity index 99% rename from cloud/apps/relay/src/cell-admission-selector.ts rename to cloud/apps/relay/src/cell/admission/cell-admission-selector.ts index 553c28e9477..5b5be11b884 100644 --- a/cloud/apps/relay/src/cell-admission-selector.ts +++ b/cloud/apps/relay/src/cell/admission/cell-admission-selector.ts @@ -1,5 +1,5 @@ import { createHash } from 'node:crypto' -import type { RelayDatabase, SqlRow } from './database.js' +import type { RelayDatabase, SqlRow } from '../../database/database.js' export const CELL_ADMISSION_STATES = [ 'existing-only', diff --git a/cloud/apps/relay/src/cell-admission-startup-postgres.test.ts b/cloud/apps/relay/src/cell/admission/cell-admission-startup-postgres.test.ts similarity index 93% rename from cloud/apps/relay/src/cell-admission-startup-postgres.test.ts rename to cloud/apps/relay/src/cell/admission/cell-admission-startup-postgres.test.ts index 287ef354180..4bf8a09bb7a 100644 --- a/cloud/apps/relay/src/cell-admission-startup-postgres.test.ts +++ b/cloud/apps/relay/src/cell/admission/cell-admission-startup-postgres.test.ts @@ -1,9 +1,9 @@ import pg from 'pg' import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' +import { RelayAssignmentStore } from '../../assignment/assignment-store.js' import { reconcileCellAdmissionAtStartup } from './cell-admission-startup.js' -import type { RelayCellConfig } from './config.js' -import { openRelayDatabase, type RelayDatabase } from './database.js' +import type { RelayCellConfig } from '../../config.js' +import { openRelayDatabase, type RelayDatabase } from '../../database/database.js' const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL const describePostgres = databaseUrl ? describe : describe.skip diff --git a/cloud/apps/relay/src/cell-admission-startup.test.ts b/cloud/apps/relay/src/cell/admission/cell-admission-startup.test.ts similarity index 98% rename from cloud/apps/relay/src/cell-admission-startup.test.ts rename to cloud/apps/relay/src/cell/admission/cell-admission-startup.test.ts index d08d9eefc16..7ac27421b51 100644 --- a/cloud/apps/relay/src/cell-admission-startup.test.ts +++ b/cloud/apps/relay/src/cell/admission/cell-admission-startup.test.ts @@ -3,7 +3,7 @@ import { reconcileCellAdmissionAtStartup, roleOwnsAssignmentMaintenance } from './cell-admission-startup.js' -import type { RelayCellConfig } from './config.js' +import type { RelayCellConfig } from '../../config.js' const cells: RelayCellConfig[] = [ { diff --git a/cloud/apps/relay/src/cell-admission-startup.ts b/cloud/apps/relay/src/cell/admission/cell-admission-startup.ts similarity index 88% rename from cloud/apps/relay/src/cell-admission-startup.ts rename to cloud/apps/relay/src/cell/admission/cell-admission-startup.ts index fa8a16b20aa..b9e85d2efc9 100644 --- a/cloud/apps/relay/src/cell-admission-startup.ts +++ b/cloud/apps/relay/src/cell/admission/cell-admission-startup.ts @@ -1,6 +1,6 @@ -import type { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { RelayConfig } from './config.js' -import { retryTransientDatabaseStartup } from './database-startup-retry.js' +import type { RelayAssignmentStore } from '../../assignment/assignment-store.js' +import type { RelayConfig } from '../../config.js' +import { retryTransientDatabaseStartup } from '../../database/database-startup-retry.js' type CellAdmissionStartupConfig = Pick type CellAdmissionStore = Pick diff --git a/cloud/apps/relay/src/cell-boot-without-database-postgres.test.ts b/cloud/apps/relay/src/cell/admission/cell-boot-without-database-postgres.test.ts similarity index 94% rename from cloud/apps/relay/src/cell-boot-without-database-postgres.test.ts rename to cloud/apps/relay/src/cell/admission/cell-boot-without-database-postgres.test.ts index 5925f6705ba..1d2c67cbfa0 100644 --- a/cloud/apps/relay/src/cell-boot-without-database-postgres.test.ts +++ b/cloud/apps/relay/src/cell/admission/cell-boot-without-database-postgres.test.ts @@ -1,10 +1,10 @@ import { createServer as createHttpServer, type Server } from 'node:http' import { createServer as createTcpServer, connect, type AddressInfo } from 'node:net' import { afterEach, describe, expect, it } from 'vitest' -import type { RelayConfig } from './config.js' -import { openRelayDatabase, type RelayDatabase } from './database.js' -import { createRelayReadiness } from './relay-readiness.js' -import { createRelayServer } from './relay-server.js' +import type { RelayConfig } from '../../config.js' +import { openRelayDatabase, type RelayDatabase } from '../../database/database.js' +import { createRelayReadiness } from '../../process-lifecycle/relay-readiness.js' +import { createRelayServer } from '../../relay-server.js' const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL const describePostgres = databaseUrl ? describe : describe.skip diff --git a/cloud/apps/relay/src/cell-connection-cap-postgres.test.ts b/cloud/apps/relay/src/cell/admission/cell-connection-cap-postgres.test.ts similarity index 93% rename from cloud/apps/relay/src/cell-connection-cap-postgres.test.ts rename to cloud/apps/relay/src/cell/admission/cell-connection-cap-postgres.test.ts index 404b1f18112..8f4ecbdd161 100644 --- a/cloud/apps/relay/src/cell-connection-cap-postgres.test.ts +++ b/cloud/apps/relay/src/cell/admission/cell-connection-cap-postgres.test.ts @@ -1,8 +1,8 @@ import { afterAll, beforeAll, describe, expect, it } from 'vitest' -import { ASSIGNMENT_CONNECTION_HEADROOM_QUERY } from './assignment/assignment-connection-headroom-query.js' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { RelayCellConfig } from './config.js' -import { openRelayDatabase, type RelayDatabase } from './database.js' +import { ASSIGNMENT_CONNECTION_HEADROOM_QUERY } from '../../assignment/assignment-connection-headroom-query.js' +import { RelayAssignmentStore } from '../../assignment/assignment-store.js' +import type { RelayCellConfig } from '../../config.js' +import { openRelayDatabase, type RelayDatabase } from '../../database/database.js' const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL const describePostgres = databaseUrl ? describe : describe.skip diff --git a/cloud/apps/relay/src/cell-connection-cap.test.ts b/cloud/apps/relay/src/cell/admission/cell-connection-cap.test.ts similarity index 98% rename from cloud/apps/relay/src/cell-connection-cap.test.ts rename to cloud/apps/relay/src/cell/admission/cell-connection-cap.test.ts index 63b29f9f084..26315b8e67b 100644 --- a/cloud/apps/relay/src/cell-connection-cap.test.ts +++ b/cloud/apps/relay/src/cell/admission/cell-connection-cap.test.ts @@ -1,9 +1,9 @@ import { createHash } from 'node:crypto' import { afterEach, describe, expect, it, vi } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' +import { RelayAssignmentStore } from '../../assignment/assignment-store.js' import { encodeMembership, type CellAdmissionMembership } from './cell-admission-selector.js' -import type { RelayCellConfig } from './config.js' -import { openInMemoryRelayDatabase, type RelayDatabase } from './database.js' +import type { RelayCellConfig } from '../../config.js' +import { openInMemoryRelayDatabase, type RelayDatabase } from '../../database/database.js' const HEARTBEAT_TTL_MS = 45_000 const BOUND = 60 diff --git a/cloud/apps/relay/src/cell-connection-cap.ts b/cloud/apps/relay/src/cell/admission/cell-connection-cap.ts similarity index 97% rename from cloud/apps/relay/src/cell-connection-cap.ts rename to cloud/apps/relay/src/cell/admission/cell-connection-cap.ts index dea85378d73..9c7377576f6 100644 --- a/cloud/apps/relay/src/cell-connection-cap.ts +++ b/cloud/apps/relay/src/cell/admission/cell-connection-cap.ts @@ -1,6 +1,6 @@ -import { RELAY_ADMISSION_BUDGETS } from '@orca-cloud/relay-contract' -import type { RelayCellConfig } from './config.js' -import type { RelayDatabase, SqlRow } from './database.js' +import { RELAY_ADMISSION_BUDGETS } from '@orca-cloud/relay-contract/admission-budgets' +import type { RelayCellConfig } from '../../config.js' +import type { RelayDatabase, SqlRow } from '../../database/database.js' // During resize, placement uses min(configured, reported) to avoid phantom seats; unstamped NULL reports take configured cap via ELSE. export const EFFECTIVE_HARD_CAP_SQL = `(CASE WHEN limits.reported_hard_cap < limits.hard_cap diff --git a/cloud/apps/relay/src/cell-fence-legacy-adoption-postgres.test.ts b/cloud/apps/relay/src/cell/admission/cell-fence-legacy-adoption-postgres.test.ts similarity index 96% rename from cloud/apps/relay/src/cell-fence-legacy-adoption-postgres.test.ts rename to cloud/apps/relay/src/cell/admission/cell-fence-legacy-adoption-postgres.test.ts index 7b30d0cefb8..bd815a9189c 100644 --- a/cloud/apps/relay/src/cell-fence-legacy-adoption-postgres.test.ts +++ b/cloud/apps/relay/src/cell/admission/cell-fence-legacy-adoption-postgres.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, it } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import { openRelayDatabase, type RelayDatabase } from './database.js' +import { RelayAssignmentStore } from '../../assignment/assignment-store.js' +import { openRelayDatabase, type RelayDatabase } from '../../database/database.js' const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL const describePostgres = databaseUrl ? describe : describe.skip diff --git a/cloud/apps/relay/src/cell-inventory-lock-contention.test.ts b/cloud/apps/relay/src/cell/admission/cell-inventory-lock-contention.test.ts similarity index 95% rename from cloud/apps/relay/src/cell-inventory-lock-contention.test.ts rename to cloud/apps/relay/src/cell/admission/cell-inventory-lock-contention.test.ts index 3d2e977bc49..03ec204d7cf 100644 --- a/cloud/apps/relay/src/cell-inventory-lock-contention.test.ts +++ b/cloud/apps/relay/src/cell/admission/cell-inventory-lock-contention.test.ts @@ -1,4 +1,5 @@ import { afterEach, describe, expect, it, vi } from 'vitest' +import type { RelayDatabase } from '../../database/database.js' const fakes = vi.hoisted(() => ({ statements: [] as string[], @@ -31,9 +32,7 @@ vi.mock('pg', () => ({ } })) -const { openRelayDatabase } = await import('./database.js') - -type RelayDatabase = import('./database.js').RelayDatabase +const { openRelayDatabase } = await import('../../database/database.js') const CELL_INVENTORY_SQL = 'SELECT * FROM relay_cells ORDER BY cell_id ASC' diff --git a/cloud/apps/relay/src/cell-inventory-per-cell-locking-postgres.test.ts b/cloud/apps/relay/src/cell/admission/cell-inventory-per-cell-locking-postgres.test.ts similarity index 97% rename from cloud/apps/relay/src/cell-inventory-per-cell-locking-postgres.test.ts rename to cloud/apps/relay/src/cell/admission/cell-inventory-per-cell-locking-postgres.test.ts index 03b51f0a426..5ce27345f25 100644 --- a/cloud/apps/relay/src/cell-inventory-per-cell-locking-postgres.test.ts +++ b/cloud/apps/relay/src/cell/admission/cell-inventory-per-cell-locking-postgres.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, it } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import { openRelayDatabase, type RelayDatabase } from './database.js' +import { RelayAssignmentStore } from '../../assignment/assignment-store.js' +import { openRelayDatabase, type RelayDatabase } from '../../database/database.js' const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL const describePostgres = databaseUrl ? describe : describe.skip diff --git a/cloud/apps/relay/src/staging-asia-proof-admission.test.ts b/cloud/apps/relay/src/cell/admission/staging-asia-proof-admission.test.ts similarity index 100% rename from cloud/apps/relay/src/staging-asia-proof-admission.test.ts rename to cloud/apps/relay/src/cell/admission/staging-asia-proof-admission.test.ts diff --git a/cloud/apps/relay/src/staging-asia-proof-admission.ts b/cloud/apps/relay/src/cell/admission/staging-asia-proof-admission.ts similarity index 100% rename from cloud/apps/relay/src/staging-asia-proof-admission.ts rename to cloud/apps/relay/src/cell/admission/staging-asia-proof-admission.ts diff --git a/cloud/apps/relay/src/cell-heartbeat-client.test.ts b/cloud/apps/relay/src/cell/cell-heartbeat-client.test.ts similarity index 99% rename from cloud/apps/relay/src/cell-heartbeat-client.test.ts rename to cloud/apps/relay/src/cell/cell-heartbeat-client.test.ts index 6c36829e768..1cc1e799bc8 100644 --- a/cloud/apps/relay/src/cell-heartbeat-client.test.ts +++ b/cloud/apps/relay/src/cell/cell-heartbeat-client.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import type { RelayConfig } from './config.js' +import type { RelayConfig } from '../config.js' import { startCellHeartbeat } from './cell-heartbeat-client.js' const CONFIG = { diff --git a/cloud/apps/relay/src/cell-heartbeat-client.ts b/cloud/apps/relay/src/cell/cell-heartbeat-client.ts similarity index 94% rename from cloud/apps/relay/src/cell-heartbeat-client.ts rename to cloud/apps/relay/src/cell/cell-heartbeat-client.ts index 54f97a17af8..10cabe67aa1 100644 --- a/cloud/apps/relay/src/cell-heartbeat-client.ts +++ b/cloud/apps/relay/src/cell/cell-heartbeat-client.ts @@ -1,8 +1,8 @@ import { randomUUID } from 'node:crypto' -import { RELAY_DEFAULT_REGION } from '@orca-cloud/relay-contract' -import type { RelayConfig } from './config.js' -import { googleMetadataIdentityToken } from './google-metadata-identity-token.js' -import type { RegionalRehomeSafetySnapshot } from './relay-observability.js' +import { RELAY_DEFAULT_REGION } from '@orca-cloud/relay-contract/relay-regions' +import type { RelayConfig } from '../config.js' +import { googleMetadataIdentityToken } from '../authentication/google-metadata-identity-token.js' +import type { RegionalRehomeSafetySnapshot } from '../observability/relay-observability.js' type ConnectionCounts = { totalConnections: number diff --git a/cloud/apps/relay/src/cell-flags.ts b/cloud/apps/relay/src/cell/control-flags/cell-flags.ts similarity index 100% rename from cloud/apps/relay/src/cell-flags.ts rename to cloud/apps/relay/src/cell/control-flags/cell-flags.ts diff --git a/cloud/apps/relay/src/relay-control-flag-channel.test.ts b/cloud/apps/relay/src/cell/control-flags/relay-control-flag-channel.test.ts similarity index 100% rename from cloud/apps/relay/src/relay-control-flag-channel.test.ts rename to cloud/apps/relay/src/cell/control-flags/relay-control-flag-channel.test.ts diff --git a/cloud/apps/relay/src/relay-control-flag-channel.ts b/cloud/apps/relay/src/cell/control-flags/relay-control-flag-channel.ts similarity index 100% rename from cloud/apps/relay/src/relay-control-flag-channel.ts rename to cloud/apps/relay/src/cell/control-flags/relay-control-flag-channel.ts diff --git a/cloud/apps/relay/src/cell-admit-effective-writer.test.ts b/cloud/apps/relay/src/cell/reservations/cell-admit-effective-writer.test.ts similarity index 100% rename from cloud/apps/relay/src/cell-admit-effective-writer.test.ts rename to cloud/apps/relay/src/cell/reservations/cell-admit-effective-writer.test.ts diff --git a/cloud/apps/relay/src/cell-admit-effective-writer.ts b/cloud/apps/relay/src/cell/reservations/cell-admit-effective-writer.ts similarity index 100% rename from cloud/apps/relay/src/cell-admit-effective-writer.ts rename to cloud/apps/relay/src/cell/reservations/cell-admit-effective-writer.ts diff --git a/cloud/apps/relay/src/cell-dead-man-trip-slot-postgres.test.ts b/cloud/apps/relay/src/cell/reservations/cell-dead-man-trip-slot-postgres.test.ts similarity index 97% rename from cloud/apps/relay/src/cell-dead-man-trip-slot-postgres.test.ts rename to cloud/apps/relay/src/cell/reservations/cell-dead-man-trip-slot-postgres.test.ts index b95cb6d3af4..79ed0689b04 100644 --- a/cloud/apps/relay/src/cell-dead-man-trip-slot-postgres.test.ts +++ b/cloud/apps/relay/src/cell/reservations/cell-dead-man-trip-slot-postgres.test.ts @@ -1,7 +1,7 @@ import { randomUUID } from 'node:crypto' import { afterAll, beforeAll, describe, expect, it } from 'vitest' import { claimDeadManTripSlot, DEAD_MAN_SLOT_HOLD_MS } from './cell-dead-man-trip-slot.js' -import { openRelayDatabase, type RelayDatabase } from './database.js' +import { openRelayDatabase, type RelayDatabase } from '../../database/database.js' // Concurrent claims on real PostgreSQL: a director outage trips at most `slots` cells, however // many claim at the same moment. diff --git a/cloud/apps/relay/src/cell-dead-man-trip-slot.ts b/cloud/apps/relay/src/cell/reservations/cell-dead-man-trip-slot.ts similarity index 95% rename from cloud/apps/relay/src/cell-dead-man-trip-slot.ts rename to cloud/apps/relay/src/cell/reservations/cell-dead-man-trip-slot.ts index d95979c6cad..0a2d6ce5e6d 100644 --- a/cloud/apps/relay/src/cell-dead-man-trip-slot.ts +++ b/cloud/apps/relay/src/cell/reservations/cell-dead-man-trip-slot.ts @@ -1,4 +1,4 @@ -import { commitWithFinalWrite, type RelayDatabase } from './database.js' +import { commitWithFinalWrite, type RelayDatabase } from '../../database/database.js' // Outlive busy refresh gaps, but release the slot of a cell that died while tripped. export const DEAD_MAN_SLOT_HOLD_MS = 10 * 60_000 diff --git a/cloud/apps/relay/src/cell-reserve-admission.blackbox.test.ts b/cloud/apps/relay/src/cell/reservations/cell-reserve-admission.blackbox.test.ts similarity index 97% rename from cloud/apps/relay/src/cell-reserve-admission.blackbox.test.ts rename to cloud/apps/relay/src/cell/reservations/cell-reserve-admission.blackbox.test.ts index 8e82caa5acd..6da506577fe 100644 --- a/cloud/apps/relay/src/cell-reserve-admission.blackbox.test.ts +++ b/cloud/apps/relay/src/cell/reservations/cell-reserve-admission.blackbox.test.ts @@ -1,20 +1,20 @@ import { createHash, createHmac } from 'node:crypto' import { createServer, type Server } from 'node:http' import { createServer as createNetServer } from 'node:net' -import { buildHostProofMacInput, HOST_CHALLENGE_PLAINTEXT_DOMAIN } from '@orca-cloud/relay-contract' +import { buildHostProofMacInput, HOST_CHALLENGE_PLAINTEXT_DOMAIN } from '@orca-cloud/relay-contract/host-proof-transcript' import { exportJWK, generateKeyPair, SignJWT } from 'jose' import nacl from 'tweetnacl' import { afterEach, describe, expect, it, vi } from 'vitest' import WebSocket from 'ws' import type { RawData } from 'ws' -import { CELL_FLAG_DEFAULTS, type CellFlags } from './cell-flags.js' -import { CELL_SEAT_DRIFT_SWEEP_MS } from './cell-seat-drift.js' -import type { CellSeatLog } from './cell-seat-log.js' -import type { RelayConfig } from './config.js' -import { PostgresDatabase } from './database.js' -import type { AppliedControlFlags } from './relay-control-flag-channel.js' -import { createRelayServer, HOST_HELLO_SHED_OLDEST_WAIT_MS } from './relay-server.js' -import { RELAY_WEBSOCKET_FORCE_CLOSE_MS } from './relay-websocket-close.js' +import { CELL_FLAG_DEFAULTS, type CellFlags } from '../control-flags/cell-flags.js' +import { CELL_SEAT_DRIFT_SWEEP_MS } from '../seats/cell-seat-drift.js' +import type { CellSeatLog } from '../seats/cell-seat-log.js' +import type { RelayConfig } from '../../config.js' +import { PostgresDatabase } from '../../database/database.js' +import type { AppliedControlFlags } from '../control-flags/relay-control-flag-channel.js' +import { createRelayServer, HOST_HELLO_SHED_OLDEST_WAIT_MS } from '../../relay-server.js' +import { RELAY_WEBSOCKET_FORCE_CLOSE_MS } from '../../connections/relay-websocket-close.js' // Wedged database and armed shedding must still admit booked/recently seated hosts, while refusing strangers. diff --git a/cloud/apps/relay/src/cell-reserve-book.test.ts b/cloud/apps/relay/src/cell/reservations/cell-reserve-book.test.ts similarity index 100% rename from cloud/apps/relay/src/cell-reserve-book.test.ts rename to cloud/apps/relay/src/cell/reservations/cell-reserve-book.test.ts diff --git a/cloud/apps/relay/src/cell-reserve-book.ts b/cloud/apps/relay/src/cell/reservations/cell-reserve-book.ts similarity index 100% rename from cloud/apps/relay/src/cell-reserve-book.ts rename to cloud/apps/relay/src/cell/reservations/cell-reserve-book.ts diff --git a/cloud/apps/relay/src/cell-reserve-client.test.ts b/cloud/apps/relay/src/cell/reservations/cell-reserve-client.test.ts similarity index 100% rename from cloud/apps/relay/src/cell-reserve-client.test.ts rename to cloud/apps/relay/src/cell/reservations/cell-reserve-client.test.ts diff --git a/cloud/apps/relay/src/cell-reserve-client.ts b/cloud/apps/relay/src/cell/reservations/cell-reserve-client.ts similarity index 97% rename from cloud/apps/relay/src/cell-reserve-client.ts rename to cloud/apps/relay/src/cell/reservations/cell-reserve-client.ts index a17013ac055..dbe05356095 100644 --- a/cloud/apps/relay/src/cell-reserve-client.ts +++ b/cloud/apps/relay/src/cell/reservations/cell-reserve-client.ts @@ -7,7 +7,7 @@ import { type DemoteRequest, type ReserveItem } from './cell-reserve-contract.js' -import type { ReserveAttempt } from './reserve-placement.js' +import type { ReserveAttempt } from '../../assignment/reserve-placement/reserve-placement.js' // Batch bookings per cell for 5ms/64 items; unreadable replies mark the whole batch unreachable for one of the request’s three tries. export const CELL_RESERVE_FLUSH_MS = 5 diff --git a/cloud/apps/relay/src/cell-reserve-contract.ts b/cloud/apps/relay/src/cell/reservations/cell-reserve-contract.ts similarity index 100% rename from cloud/apps/relay/src/cell-reserve-contract.ts rename to cloud/apps/relay/src/cell/reservations/cell-reserve-contract.ts diff --git a/cloud/apps/relay/src/cell-reserve-dead-man-slots.blackbox.test.ts b/cloud/apps/relay/src/cell/reservations/cell-reserve-dead-man-slots.blackbox.test.ts similarity index 97% rename from cloud/apps/relay/src/cell-reserve-dead-man-slots.blackbox.test.ts rename to cloud/apps/relay/src/cell/reservations/cell-reserve-dead-man-slots.blackbox.test.ts index ac040d98c92..7c0eba9cacb 100644 --- a/cloud/apps/relay/src/cell-reserve-dead-man-slots.blackbox.test.ts +++ b/cloud/apps/relay/src/cell/reservations/cell-reserve-dead-man-slots.blackbox.test.ts @@ -5,8 +5,8 @@ import { afterEach, describe, expect, it, vi } from 'vitest' import WebSocket from 'ws' import { DEAD_MAN_SLOT_CLAIM_RETRY_MS } from './cell-admit-effective-writer.js' import { reserveDeadManWindowMs } from './cell-reserve-dead-man.js' -import { openRelayDatabase, type RelayDatabase } from './database.js' -import { startReserveModeCell } from './test-fixtures/reserve-mode-cell.js' +import { openRelayDatabase, type RelayDatabase } from '../../database/database.js' +import { startReserveModeCell } from '../../test-fixtures/reserve-mode-cell.js' // A director outage with deadManTripSlots set: at most that many reserve cells trip to their full // database pools. A cell left without a slot stays in reserve, serving its hosts from memory. diff --git a/cloud/apps/relay/src/cell-reserve-dead-man.test.ts b/cloud/apps/relay/src/cell/reservations/cell-reserve-dead-man.test.ts similarity index 97% rename from cloud/apps/relay/src/cell-reserve-dead-man.test.ts rename to cloud/apps/relay/src/cell/reservations/cell-reserve-dead-man.test.ts index 3203b7263fc..c6ad9578d82 100644 --- a/cloud/apps/relay/src/cell-reserve-dead-man.test.ts +++ b/cloud/apps/relay/src/cell/reservations/cell-reserve-dead-man.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from 'vitest' -import { CELL_FLAG_DEFAULTS, type CellFlags } from './cell-flags.js' +import { CELL_FLAG_DEFAULTS, type CellFlags } from '../control-flags/cell-flags.js' import { ReserveDeadMan } from './cell-reserve-dead-man.js' -import type { AppliedControlFlags } from './relay-control-flag-channel.js' +import type { AppliedControlFlags } from '../control-flags/relay-control-flag-channel.js' const WINDOW_MS = 60_000 diff --git a/cloud/apps/relay/src/cell-reserve-dead-man.ts b/cloud/apps/relay/src/cell/reservations/cell-reserve-dead-man.ts similarity index 96% rename from cloud/apps/relay/src/cell-reserve-dead-man.ts rename to cloud/apps/relay/src/cell/reservations/cell-reserve-dead-man.ts index a02a671fadd..0038f282741 100644 --- a/cloud/apps/relay/src/cell-reserve-dead-man.ts +++ b/cloud/apps/relay/src/cell/reservations/cell-reserve-dead-man.ts @@ -1,6 +1,6 @@ import { createHash } from 'node:crypto' -import type { CellFlags } from './cell-flags.js' -import type { AppliedControlFlags } from './relay-control-flag-channel.js' +import type { CellFlags } from '../control-flags/cell-flags.js' +import type { AppliedControlFlags } from '../control-flags/relay-control-flag-channel.js' // Without placing-director contact, memory-only reserve ownership cannot supersede hosts; flip back to db and re-register as a switch flip would. export const RESERVE_DEAD_MAN_MS = 60_000 diff --git a/cloud/apps/relay/src/cell-reserve-flip-back-postgres.test.ts b/cloud/apps/relay/src/cell/reservations/cell-reserve-flip-back-postgres.test.ts similarity index 95% rename from cloud/apps/relay/src/cell-reserve-flip-back-postgres.test.ts rename to cloud/apps/relay/src/cell/reservations/cell-reserve-flip-back-postgres.test.ts index 3d9a7849f4d..af96e74f0ce 100644 --- a/cloud/apps/relay/src/cell-reserve-flip-back-postgres.test.ts +++ b/cloud/apps/relay/src/cell/reservations/cell-reserve-flip-back-postgres.test.ts @@ -3,9 +3,9 @@ import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it, vi } from 'vitest' import WebSocket from 'ws' -import { openRelayDatabase, type RelayDatabase } from './database.js' -import { openDelayedPostgresDatabase, type StatementDelay } from './test-fixtures/delayed-postgres-database.js' -import { RESERVE_MODE_CELL_ID, startReserveModeCell } from './test-fixtures/reserve-mode-cell.js' +import { openRelayDatabase, type RelayDatabase } from '../../database/database.js' +import { openDelayedPostgresDatabase, type StatementDelay } from '../../test-fixtures/delayed-postgres-database.js' +import { RESERVE_MODE_CELL_ID, startReserveModeCell } from '../../test-fixtures/reserve-mode-cell.js' // PostgreSQL flip-back keeps controls connected, reserves most pool capacity for DB work and folds cell deltas per tick even across cross-region round trips (E-mix). diff --git a/cloud/apps/relay/src/cell-reserve-rollback.blackbox.test.ts b/cloud/apps/relay/src/cell/reservations/cell-reserve-rollback.blackbox.test.ts similarity index 98% rename from cloud/apps/relay/src/cell-reserve-rollback.blackbox.test.ts rename to cloud/apps/relay/src/cell/reservations/cell-reserve-rollback.blackbox.test.ts index 5caadd2ecd5..8a95309dbee 100644 --- a/cloud/apps/relay/src/cell-reserve-rollback.blackbox.test.ts +++ b/cloud/apps/relay/src/cell/reservations/cell-reserve-rollback.blackbox.test.ts @@ -5,13 +5,13 @@ import { afterEach, describe, expect, it, vi } from 'vitest' import WebSocket from 'ws' import { CELL_ADMIT_EFFECTIVE_REFRESH_MS } from './cell-admit-effective-writer.js' import { RESERVE_DEAD_MAN_MS, reserveDeadManWindowMs } from './cell-reserve-dead-man.js' -import { openRelayDatabase } from './database.js' +import { openRelayDatabase } from '../../database/database.js' import { REREGISTER_MAX_ATTEMPTS, REREGISTER_STALL_LOG_EVERY, reregisterInFlightLimit -} from './host-session-registry.js' -import { startReserveModeCell } from './test-fixtures/reserve-mode-cell.js' +} from '../../connections/host-session-registry.js' +import { startReserveModeCell } from '../../test-fixtures/reserve-mode-cell.js' // Flip back (E-mix): a cell leaves reserve mode with hosts it admitted from memory. Nobody is // disconnected, and the database ends up holding exactly the leases its seat report names. diff --git a/cloud/apps/relay/src/cell-reserve-routes.test.ts b/cloud/apps/relay/src/cell/reservations/cell-reserve-routes.test.ts similarity index 98% rename from cloud/apps/relay/src/cell-reserve-routes.test.ts rename to cloud/apps/relay/src/cell/reservations/cell-reserve-routes.test.ts index 32390953df1..f2bf59438cd 100644 --- a/cloud/apps/relay/src/cell-reserve-routes.test.ts +++ b/cloud/apps/relay/src/cell/reservations/cell-reserve-routes.test.ts @@ -1,7 +1,7 @@ import { Hono } from 'hono' import { describe, expect, it, vi } from 'vitest' import { registerCellReserveRoutes } from './cell-reserve-routes.js' -import type { RelayConfig } from './config.js' +import type { RelayConfig } from '../../config.js' const cell = { role: 'cell', diff --git a/cloud/apps/relay/src/cell-reserve-routes.ts b/cloud/apps/relay/src/cell/reservations/cell-reserve-routes.ts similarity index 95% rename from cloud/apps/relay/src/cell-reserve-routes.ts rename to cloud/apps/relay/src/cell/reservations/cell-reserve-routes.ts index 3bedeaa99ac..cc3e39f09ea 100644 --- a/cloud/apps/relay/src/cell-reserve-routes.ts +++ b/cloud/apps/relay/src/cell/reservations/cell-reserve-routes.ts @@ -9,8 +9,8 @@ import { type ReserveOutcome, type ReserveRequest } from './cell-reserve-contract.js' -import type { RelayConfig } from './config.js' -import { readBearer } from './relay-token-verifier.js' +import type { RelayConfig } from '../../config.js' +import { readBearer } from '../../authentication/relay-token-verifier.js' const MAX_BODY_BYTES = 16 * 1024 // The app-wide 4 KiB body limit skips these; they enforce their own larger one. diff --git a/cloud/apps/relay/src/cell-poll-reachability.test.ts b/cloud/apps/relay/src/cell/seats/cell-poll-reachability.test.ts similarity index 100% rename from cloud/apps/relay/src/cell-poll-reachability.test.ts rename to cloud/apps/relay/src/cell/seats/cell-poll-reachability.test.ts diff --git a/cloud/apps/relay/src/cell-poll-reachability.ts b/cloud/apps/relay/src/cell/seats/cell-poll-reachability.ts similarity index 100% rename from cloud/apps/relay/src/cell-poll-reachability.ts rename to cloud/apps/relay/src/cell/seats/cell-poll-reachability.ts diff --git a/cloud/apps/relay/src/cell-seat-drift.test.ts b/cloud/apps/relay/src/cell/seats/cell-seat-drift.test.ts similarity index 100% rename from cloud/apps/relay/src/cell-seat-drift.test.ts rename to cloud/apps/relay/src/cell/seats/cell-seat-drift.test.ts diff --git a/cloud/apps/relay/src/cell-seat-drift.ts b/cloud/apps/relay/src/cell/seats/cell-seat-drift.ts similarity index 100% rename from cloud/apps/relay/src/cell-seat-drift.ts rename to cloud/apps/relay/src/cell/seats/cell-seat-drift.ts diff --git a/cloud/apps/relay/src/cell-seat-feed-route.ts b/cloud/apps/relay/src/cell/seats/cell-seat-feed-route.ts similarity index 90% rename from cloud/apps/relay/src/cell-seat-feed-route.ts rename to cloud/apps/relay/src/cell/seats/cell-seat-feed-route.ts index 4991b756375..7cfa07ec998 100644 --- a/cloud/apps/relay/src/cell-seat-feed-route.ts +++ b/cloud/apps/relay/src/cell/seats/cell-seat-feed-route.ts @@ -1,11 +1,11 @@ import type { Hono } from 'hono' -import type { CellFlags } from './cell-flags.js' +import type { CellFlags } from '../control-flags/cell-flags.js' import type { CellSeatFeedPage } from './cell-seat-log.js' import { parseCellSeatCursor } from './cell-seat-log.js' -import type { RelayConfig } from './config.js' -import type { AppliedControlFlags } from './relay-control-flag-channel.js' -import type { RelayRuntimeCounts } from './relay-observability.js' -import { readBearer } from './relay-token-verifier.js' +import type { RelayConfig } from '../../config.js' +import type { AppliedControlFlags } from '../control-flags/relay-control-flag-channel.js' +import type { RelayRuntimeCounts } from '../../observability/relay-observability.js' +import { readBearer } from '../../authentication/relay-token-verifier.js' // Reuse read-only rehome credentials only on cells already holding the pair; distributing it further would enable rehome. export function registerCellSeatFeedRoute( diff --git a/cloud/apps/relay/src/cell-seat-feed.test.ts b/cloud/apps/relay/src/cell/seats/cell-seat-feed.test.ts similarity index 92% rename from cloud/apps/relay/src/cell-seat-feed.test.ts rename to cloud/apps/relay/src/cell/seats/cell-seat-feed.test.ts index d2f1952a9fe..28a9ced67f3 100644 --- a/cloud/apps/relay/src/cell-seat-feed.test.ts +++ b/cloud/apps/relay/src/cell/seats/cell-seat-feed.test.ts @@ -1,21 +1,21 @@ import { EventEmitter } from 'node:events' -import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract' +import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type WebSocket from 'ws' import { z } from 'zod' -import type { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { CellFlags } from './cell-flags.js' -import type { RelayConfig } from './config.js' -import type { RelayCredentialStore } from './credential-store.js' -import { HostSessionRegistry, type HostSession } from './host-session-registry.js' -import type { AppliedControlFlags } from './relay-control-flag-channel.js' -import type { RelayRuntimeObserver } from './relay-observability.js' -import type { RelayTokenClaims } from './relay-token-verifier.js' -import { ProcessQueuedByteBudget } from './splice-forwarder.js' +import type { RelayAssignmentStore } from '../../assignment/assignment-store.js' +import type { CellFlags } from '../control-flags/cell-flags.js' +import type { RelayConfig } from '../../config.js' +import type { RelayCredentialStore } from '../../credentials/credential-store.js' +import { HostSessionRegistry, type HostSession } from '../../connections/host-session-registry.js' +import type { AppliedControlFlags } from '../control-flags/relay-control-flag-channel.js' +import type { RelayRuntimeObserver } from '../../observability/relay-observability.js' +import type { RelayTokenClaims } from '../../authentication/relay-token-verifier.js' +import { ProcessQueuedByteBudget } from '../../connections/splice-forwarder.js' const adminTokenChecks = vi.hoisted(() => ({ count: 0 })) -vi.mock('./admin-token-verifier.js', () => ({ +vi.mock('../../authentication/admin-token-verifier.js', () => ({ createAdminTokenVerifier: () => async (token: string) => { adminTokenChecks.count += 1 return token === 'deploy-token' @@ -27,7 +27,7 @@ vi.mock('./admin-token-verifier.js', () => ({ createRuntimeTokenVerifier: () => async () => false })) -import { createRelayApp } from './app.js' +import { createRelayApp } from '../../app.js' class FakeSocket extends EventEmitter { readonly OPEN = 1 diff --git a/cloud/apps/relay/src/cell-seat-log.test.ts b/cloud/apps/relay/src/cell/seats/cell-seat-log.test.ts similarity index 100% rename from cloud/apps/relay/src/cell-seat-log.test.ts rename to cloud/apps/relay/src/cell/seats/cell-seat-log.test.ts diff --git a/cloud/apps/relay/src/cell-seat-log.ts b/cloud/apps/relay/src/cell/seats/cell-seat-log.ts similarity index 100% rename from cloud/apps/relay/src/cell-seat-log.ts rename to cloud/apps/relay/src/cell/seats/cell-seat-log.ts diff --git a/cloud/apps/relay/src/seat-feed-cells-postgres.test.ts b/cloud/apps/relay/src/cell/seats/seat-feed-cells-postgres.test.ts similarity index 89% rename from cloud/apps/relay/src/seat-feed-cells-postgres.test.ts rename to cloud/apps/relay/src/cell/seats/seat-feed-cells-postgres.test.ts index a2f3d80f7b8..ff541438065 100644 --- a/cloud/apps/relay/src/seat-feed-cells-postgres.test.ts +++ b/cloud/apps/relay/src/cell/seats/seat-feed-cells-postgres.test.ts @@ -1,8 +1,8 @@ import { randomUUID } from 'node:crypto' import { afterAll, beforeAll, describe, expect, it } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { RelayCellConfig } from './config.js' -import { openRelayDatabase, type RelayDatabase } from './database.js' +import { RelayAssignmentStore } from '../../assignment/assignment-store.js' +import type { RelayCellConfig } from '../../config.js' +import { openRelayDatabase, type RelayDatabase } from '../../database/database.js' const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL diff --git a/cloud/apps/relay/src/shadow-directory-compare.test.ts b/cloud/apps/relay/src/cell/seats/shadow-directory-compare.test.ts similarity index 96% rename from cloud/apps/relay/src/shadow-directory-compare.test.ts rename to cloud/apps/relay/src/cell/seats/shadow-directory-compare.test.ts index 8391c95d09e..6587517c2d6 100644 --- a/cloud/apps/relay/src/shadow-directory-compare.test.ts +++ b/cloud/apps/relay/src/cell/seats/shadow-directory-compare.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest' -import type { RelayAssignment } from './assignment/assignment-store.js' -import type { RelayConfig } from './config.js' +import type { RelayAssignment } from '../../assignment/assignment-store.js' +import type { RelayConfig } from '../../config.js' import { SHADOW_COMPARE_FLUSH_MS, SHADOW_COMPARE_SAMPLES_PER_CLASS, @@ -12,12 +12,12 @@ const fakes = vi.hoisted(() => ({ verifyRelayToken: vi.fn(async (token: string) => ({ sub: 'user-a', relayHostId: token })) })) -vi.mock('./relay-token-verifier.js', () => ({ +vi.mock('../../authentication/relay-token-verifier.js', () => ({ createRelayTokenVerifier: () => fakes.verifyRelayToken, readBearer: (value: string | undefined) => value?.replace(/^Bearer /, '') ?? null })) -import { createRelayApp } from './app.js' +import { createRelayApp } from '../../app.js' const HOST = 'hhhhhhhhhhhhhhhh' const IDENTITY = { userId: 'user-a', relayHostId: HOST } diff --git a/cloud/apps/relay/src/shadow-directory-compare.ts b/cloud/apps/relay/src/cell/seats/shadow-directory-compare.ts similarity index 99% rename from cloud/apps/relay/src/shadow-directory-compare.ts rename to cloud/apps/relay/src/cell/seats/shadow-directory-compare.ts index 1074ea83ae3..d2724f41eda 100644 --- a/cloud/apps/relay/src/shadow-directory-compare.ts +++ b/cloud/apps/relay/src/cell/seats/shadow-directory-compare.ts @@ -1,5 +1,5 @@ -import { RELAY_PROTOCOL_LIMITS } from '@orca-cloud/relay-contract' -import { relayHostLogDigest } from './relay-host-log-digest.js' +import { RELAY_PROTOCOL_LIMITS } from '@orca-cloud/relay-contract/protocol-limits' +import { relayHostLogDigest } from '../../observability/relay-host-log-digest.js' import type { ShadowSeatDirectory } from './shadow-seat-directory.js' // Compare memory seats against database answers for sticky verification/resolve; only count/log, preserving the database response. diff --git a/cloud/apps/relay/src/shadow-seat-directory.test.ts b/cloud/apps/relay/src/cell/seats/shadow-seat-directory.test.ts similarity index 99% rename from cloud/apps/relay/src/shadow-seat-directory.test.ts rename to cloud/apps/relay/src/cell/seats/shadow-seat-directory.test.ts index b980b88711c..a3120cb7782 100644 --- a/cloud/apps/relay/src/shadow-seat-directory.test.ts +++ b/cloud/apps/relay/src/cell/seats/shadow-seat-directory.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import { openInMemoryRelayDatabase } from './database.js' +import { RelayAssignmentStore } from '../../assignment/assignment-store.js' +import { openInMemoryRelayDatabase } from '../../database/database.js' import { SHADOW_SEAT_OUTRANK_SKEW_MS, SHADOW_SEAT_RECENTLY_LEFT_MAX_HOSTS, diff --git a/cloud/apps/relay/src/shadow-seat-directory.ts b/cloud/apps/relay/src/cell/seats/shadow-seat-directory.ts similarity index 99% rename from cloud/apps/relay/src/shadow-seat-directory.ts rename to cloud/apps/relay/src/cell/seats/shadow-seat-directory.ts index 6b72d72f8eb..b826c55e382 100644 --- a/cloud/apps/relay/src/shadow-seat-directory.ts +++ b/cloud/apps/relay/src/cell/seats/shadow-seat-directory.ts @@ -1,12 +1,12 @@ -import type { RelayRegion } from '@orca-cloud/relay-contract' +import type { RelayRegion } from '@orca-cloud/relay-contract/relay-regions' import { z } from 'zod' import { CellPollReachability, type DeadCellVerdict, isNoBackendStatus } from './cell-poll-reachability.js' -import type { RelayConfig } from './config.js' -import { googleMetadataIdentityToken, reusedIdentityToken } from './google-metadata-identity-token.js' +import type { RelayConfig } from '../../config.js' +import { googleMetadataIdentityToken, reusedIdentityToken } from '../../authentication/google-metadata-identity-token.js' // Each director mirrors cell seat feeds; callbacks reconcile booked joins and superseded seats. diff --git a/cloud/apps/relay/src/config.test.ts b/cloud/apps/relay/src/config.test.ts index c618cb54fa7..743700e35b0 100644 --- a/cloud/apps/relay/src/config.test.ts +++ b/cloud/apps/relay/src/config.test.ts @@ -1,18 +1,11 @@ import { describe, expect, it } from 'vitest' -import { - loadRelayConfig, - RELAY_CELL_CONNECTION_HARD_CAP, - RELAY_DATABASE_POOL_MAX, - RELAY_DIRECTOR_DATABASE_POOL_MAX, - RELAY_MAX_CELL_CAPACITY_REQUESTS, - RELAY_PUBLIC_RESOLVE_CONCURRENCY, - RELAY_PUBLIC_RESOLVE_WAIT_MS -} from './config.js' +import { loadRelayConfig, RELAY_DATABASE_POOL_MAX, RELAY_DIRECTOR_DATABASE_POOL_MAX, RELAY_MAX_CELL_CAPACITY_REQUESTS, RELAY_PUBLIC_RESOLVE_CONCURRENCY, RELAY_PUBLIC_RESOLVE_WAIT_MS } from './config.js' +import { RELAY_CELL_CONNECTION_HARD_CAP } from '@orca-cloud/relay-contract/admission-budgets' import { RELAY_MAX_READINESS_GRACE_MS, RELAY_READINESS_JWKS_GRACE_MS, RELAY_READINESS_SQL_GRACE_MS -} from './relay-readiness.js' +} from './process-lifecycle/relay-readiness.js' function cellEnvironment(capacity: number): NodeJS.ProcessEnv { return { diff --git a/cloud/apps/relay/src/config.ts b/cloud/apps/relay/src/config.ts index 00d4fd5999b..baa07e19c3e 100644 --- a/cloud/apps/relay/src/config.ts +++ b/cloud/apps/relay/src/config.ts @@ -1,26 +1,18 @@ import { z } from 'zod' -import { - isRelayCellConnectionHardCap, - RELAY_CELL_CONNECTION_HARD_CAP, - RELAY_MAX_CELL_CONNECTION_UNOBSERVED_BOUND, - RELAY_DEFAULT_REGION, - RelayRegionSchema, - relayCellAdmissionBounds, - type RelayCellConnectionHardCap, - type RelayRegion -} from '@orca-cloud/relay-contract' +import { isRelayCellConnectionHardCap, RELAY_CELL_CONNECTION_HARD_CAP, RELAY_MAX_CELL_CONNECTION_UNOBSERVED_BOUND, relayCellAdmissionBounds, type RelayCellConnectionHardCap } from '@orca-cloud/relay-contract/admission-budgets' +import { RELAY_DEFAULT_REGION, RelayRegionSchema, type RelayRegion } from '@orca-cloud/relay-contract/relay-regions' import { RELAY_MAX_READINESS_GRACE_MS, RELAY_READINESS_JWKS_GRACE_MS, RELAY_READINESS_SQL_GRACE_MS -} from './relay-readiness.js' +} from './process-lifecycle/relay-readiness.js' export const RELAY_MAX_CELL_CAPACITY_REQUESTS = 100_000 export const RELAY_DATABASE_POOL_MAX = 10 export const RELAY_DIRECTOR_DATABASE_POOL_MAX = 3 export const RELAY_PUBLIC_RESOLVE_CONCURRENCY = 1 export const RELAY_PUBLIC_RESOLVE_WAIT_MS = 5_000 -export { RELAY_CELL_CONNECTION_HARD_CAP } + const RelayCellConnectionHardCapSchema = z.custom( isRelayCellConnectionHardCap diff --git a/cloud/apps/relay/src/cell-phone-path.blackbox.test.ts b/cloud/apps/relay/src/connections/cell-phone-path.blackbox.test.ts similarity index 98% rename from cloud/apps/relay/src/cell-phone-path.blackbox.test.ts rename to cloud/apps/relay/src/connections/cell-phone-path.blackbox.test.ts index c1f9680946a..74a8c84eb13 100644 --- a/cloud/apps/relay/src/cell-phone-path.blackbox.test.ts +++ b/cloud/apps/relay/src/connections/cell-phone-path.blackbox.test.ts @@ -2,14 +2,14 @@ import { mkdtempSync, rmSync } from 'node:fs' import { tmpdir } from 'node:os' import { join } from 'node:path' import { afterEach, describe, expect, it, vi } from 'vitest' -import { reserveDeadManWindowMs } from './cell-reserve-dead-man.js' -import { openRelayDatabase } from './database.js' +import { reserveDeadManWindowMs } from '../cell/reservations/cell-reserve-dead-man.js' +import { openRelayDatabase } from '../database/database.js' import { nextFrame, RESERVE_MODE_CELL_ID, startReserveModeCell -} from './test-fixtures/reserve-mode-cell.js' -import { StatementRecordingDatabase } from './test-fixtures/statement-recording-database.js' +} from '../test-fixtures/reserve-mode-cell.js' +import { StatementRecordingDatabase } from '../test-fixtures/statement-recording-database.js' // Step 6: a reserve-mode cell with phonePath=memory resumes paired phones without the database. diff --git a/cloud/apps/relay/src/control-close-reason-text.ts b/cloud/apps/relay/src/connections/control-close-reason-text.ts similarity index 100% rename from cloud/apps/relay/src/control-close-reason-text.ts rename to cloud/apps/relay/src/connections/control-close-reason-text.ts diff --git a/cloud/apps/relay/src/host-close-reason-memory.test.ts b/cloud/apps/relay/src/connections/host-close-reason-memory.test.ts similarity index 94% rename from cloud/apps/relay/src/host-close-reason-memory.test.ts rename to cloud/apps/relay/src/connections/host-close-reason-memory.test.ts index dfbe0f4e779..f76fdfd8b8f 100644 --- a/cloud/apps/relay/src/host-close-reason-memory.test.ts +++ b/cloud/apps/relay/src/connections/host-close-reason-memory.test.ts @@ -1,4 +1,5 @@ -import { ASSIGNMENT_LIMITS, RELAY_HOST_CLOSE_REASON } from '@orca-cloud/relay-contract' +import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invariants' +import { RELAY_HOST_CLOSE_REASON } from '@orca-cloud/relay-contract/host-close-reason' import { describe, expect, it } from 'vitest' import { HostCloseReasonMemory } from './host-close-reason-memory.js' diff --git a/cloud/apps/relay/src/host-close-reason-memory.ts b/cloud/apps/relay/src/connections/host-close-reason-memory.ts similarity index 90% rename from cloud/apps/relay/src/host-close-reason-memory.ts rename to cloud/apps/relay/src/connections/host-close-reason-memory.ts index 0e716a47c52..55506230774 100644 --- a/cloud/apps/relay/src/host-close-reason-memory.ts +++ b/cloud/apps/relay/src/connections/host-close-reason-memory.ts @@ -1,8 +1,5 @@ -import { - ASSIGNMENT_LIMITS, - relayHostCloseReasonFrom, - type RelayHostCloseReason -} from '@orca-cloud/relay-contract' +import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invariants' +import { relayHostCloseReasonFrom, type RelayHostCloseReason } from '@orca-cloud/relay-contract/host-close-reason' // Retention matches the dormant assignment TTL: past it the host may have been // rebalanced onto another cell, so this cell is no longer the one a phone asks. diff --git a/cloud/apps/relay/src/host-control-proof-cleanup.test.ts b/cloud/apps/relay/src/connections/host-control-proof-cleanup.test.ts similarity index 98% rename from cloud/apps/relay/src/host-control-proof-cleanup.test.ts rename to cloud/apps/relay/src/connections/host-control-proof-cleanup.test.ts index 0906ad8b6f9..4af45eea7fe 100644 --- a/cloud/apps/relay/src/host-control-proof-cleanup.test.ts +++ b/cloud/apps/relay/src/connections/host-control-proof-cleanup.test.ts @@ -1,4 +1,4 @@ -import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract' +import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes' import nacl from 'tweetnacl' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { @@ -6,7 +6,7 @@ import { hostControlProofFixture as fixture, openProof, ProofSocket -} from './test-fixtures/host-control-proof.js' +} from '../test-fixtures/host-control-proof.js' beforeEach(() => vi.useFakeTimers()) afterEach(() => { diff --git a/cloud/apps/relay/src/host-control-resume-identity.test.ts b/cloud/apps/relay/src/connections/host-control-resume-identity.test.ts similarity index 96% rename from cloud/apps/relay/src/host-control-resume-identity.test.ts rename to cloud/apps/relay/src/connections/host-control-resume-identity.test.ts index 59bf38e16d5..6f0ad75382c 100644 --- a/cloud/apps/relay/src/host-control-resume-identity.test.ts +++ b/cloud/apps/relay/src/connections/host-control-resume-identity.test.ts @@ -1,12 +1,13 @@ -import { CONTROL_CONTINUITY_LIMITS, RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract' +import { CONTROL_CONTINUITY_LIMITS } from '@orca-cloud/relay-contract/control-continuity' +import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import type { RelayTokenClaims } from './relay-token-verifier.js' +import type { RelayTokenClaims } from '../authentication/relay-token-verifier.js' import { answerProof, hostControlProofFixture, openProof, ProofSocket -} from './test-fixtures/host-control-proof.js' +} from '../test-fixtures/host-control-proof.js' beforeEach(() => vi.useFakeTimers({ now: Date.parse('2026-10-11T13:20:00Z') })) afterEach(() => { diff --git a/cloud/apps/relay/src/host-session-client-accept.test.ts b/cloud/apps/relay/src/connections/host-session-client-accept.test.ts similarity index 98% rename from cloud/apps/relay/src/host-session-client-accept.test.ts rename to cloud/apps/relay/src/connections/host-session-client-accept.test.ts index b70e399277c..3dced4db25a 100644 --- a/cloud/apps/relay/src/host-session-client-accept.test.ts +++ b/cloud/apps/relay/src/connections/host-session-client-accept.test.ts @@ -1,17 +1,18 @@ import { EventEmitter } from 'node:events' -import { RELAY_CLOSE_CODE, RELAY_PROTOCOL_LIMITS } from '@orca-cloud/relay-contract' +import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes' +import { RELAY_PROTOCOL_LIMITS } from '@orca-cloud/relay-contract/protocol-limits' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type WebSocket from 'ws' -import type { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { RelayConfig } from './config.js' -import type { CredentialReservation, RelayCredentialStore } from './credential-store.js' +import type { RelayAssignmentStore } from '../assignment/assignment-store.js' +import type { RelayConfig } from '../config.js' +import type { CredentialReservation, RelayCredentialStore } from '../credentials/credential-store.js' import { CONTROL_LEASE_JITTER_MS, CONTROL_LEASE_MS, HostSessionRegistry } from './host-session-registry.js' -import type { RelayRuntimeObserver } from './relay-observability.js' -import type { RelayTokenClaims } from './relay-token-verifier.js' +import type { RelayRuntimeObserver } from '../observability/relay-observability.js' +import type { RelayTokenClaims } from '../authentication/relay-token-verifier.js' import { ProcessQueuedByteBudget } from './splice-forwarder.js' // 2026-09-04: phone dial timed out during serialized SQL; late accept leaked a 10s lease and failed bind with host_data_reservation_already_bound. diff --git a/cloud/apps/relay/src/host-session-drain-release-order.test.ts b/cloud/apps/relay/src/connections/host-session-drain-release-order.test.ts similarity index 98% rename from cloud/apps/relay/src/host-session-drain-release-order.test.ts rename to cloud/apps/relay/src/connections/host-session-drain-release-order.test.ts index 4ca22d72fa9..b7b63e7ffcb 100644 --- a/cloud/apps/relay/src/host-session-drain-release-order.test.ts +++ b/cloud/apps/relay/src/connections/host-session-drain-release-order.test.ts @@ -1,4 +1,4 @@ -import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract' +import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { DRAIN_RELEASE_BEFORE_CLOSE_MS } from './host-session-registry.js' import { @@ -6,7 +6,7 @@ import { hostControlProofFixture, openProof, ProofSocket -} from './test-fixtures/host-control-proof.js' +} from '../test-fixtures/host-control-proof.js' // A drained host redials the director the moment it reads `drain` or the close. While this // cell's release still holds the host's assignment row, that redial is refused row_busy. diff --git a/cloud/apps/relay/src/host-session-preauth-latency.test.ts b/cloud/apps/relay/src/connections/host-session-preauth-latency.test.ts similarity index 93% rename from cloud/apps/relay/src/host-session-preauth-latency.test.ts rename to cloud/apps/relay/src/connections/host-session-preauth-latency.test.ts index bca3dfe211c..59fffe9889b 100644 --- a/cloud/apps/relay/src/host-session-preauth-latency.test.ts +++ b/cloud/apps/relay/src/connections/host-session-preauth-latency.test.ts @@ -1,20 +1,17 @@ import { createHash, createHmac } from 'node:crypto' import { EventEmitter } from 'node:events' -import { - buildHostProofMacInput, - HOST_CHALLENGE_PLAINTEXT_DOMAIN, - RELAY_CLOSE_CODE -} from '@orca-cloud/relay-contract' +import { buildHostProofMacInput, HOST_CHALLENGE_PLAINTEXT_DOMAIN } from '@orca-cloud/relay-contract/host-proof-transcript' +import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes' import nacl from 'tweetnacl' import { afterEach, describe, expect, it, vi } from 'vitest' import type WebSocket from 'ws' -import type { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { CellReserveBook } from './cell-reserve-book.js' -import type { RelayConfig } from './config.js' -import type { RelayCredentialStore } from './credential-store.js' +import type { RelayAssignmentStore } from '../assignment/assignment-store.js' +import type { CellReserveBook } from '../cell/reservations/cell-reserve-book.js' +import type { RelayConfig } from '../config.js' +import type { RelayCredentialStore } from '../credentials/credential-store.js' import { HostSessionRegistry, type CellReserveAdmission } from './host-session-registry.js' -import type { RelayRuntimeObserver } from './relay-observability.js' -import type { RelayTokenClaims } from './relay-token-verifier.js' +import type { RelayRuntimeObserver } from '../observability/relay-observability.js' +import type { RelayTokenClaims } from '../authentication/relay-token-verifier.js' import { ProcessQueuedByteBudget } from './splice-forwarder.js' const CELL_ID = 'staging-gce-c1' diff --git a/cloud/apps/relay/src/host-session-registry.test.ts b/cloud/apps/relay/src/connections/host-session-registry.test.ts similarity index 98% rename from cloud/apps/relay/src/host-session-registry.test.ts rename to cloud/apps/relay/src/connections/host-session-registry.test.ts index b008a794b82..c38ae4150a1 100644 --- a/cloud/apps/relay/src/host-session-registry.test.ts +++ b/cloud/apps/relay/src/connections/host-session-registry.test.ts @@ -1,34 +1,32 @@ import { EventEmitter } from 'node:events' -import { - ASSIGNMENT_LIMITS, - CONTROL_CONTINUITY_LIMITS, - RELAY_CLOSE_CODE, - RELAY_HOST_CAPABILITY_IDLE_REGIONAL_REHOME, - RELAY_PROTOCOL_LIMITS -} from '@orca-cloud/relay-contract' +import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invariants' +import { CONTROL_CONTINUITY_LIMITS } from '@orca-cloud/relay-contract/control-continuity' +import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes' +import { RELAY_HOST_CAPABILITY_IDLE_REGIONAL_REHOME } from '@orca-cloud/relay-contract/control-messages' +import { RELAY_PROTOCOL_LIMITS } from '@orca-cloud/relay-contract/protocol-limits' import { afterEach, beforeEach, describe, expect, it, vi, type MockInstance } from 'vitest' import type WebSocket from 'ws' -import type { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { RelayConfig } from './config.js' -import { RelayStoreError, type RelayCredentialStore } from './credential-store.js' -import { CONTROL_RENEWAL_BATCH_INTERVAL_MS } from './control-renewal-batch.js' -import { - type ControlRenewalOutcome, - type ControlRenewalRequest -} from './control-renewal-statement.js' +import type { RelayAssignmentStore } from '../assignment/assignment-store.js' +import type { RelayConfig } from '../config.js' +import { RelayStoreError, type RelayCredentialStore } from '../credentials/credential-store.js' +import { CONTROL_RENEWAL_BATCH_INTERVAL_MS } from '../control-leases/control-renewal-batch.js' +import type { + ControlRenewalOutcome, + ControlRenewalRequest +} from '../control-leases/control-renewal-statement.js' import { HostSessionRegistry, IDLE_REHOME_MIN_CONTROL_AGE_MS, type HostSession } from './host-session-registry.js' -import { relayHostLogDigest } from './relay-host-log-digest.js' -import type { RelayRuntimeObserver } from './relay-observability.js' +import { relayHostLogDigest } from '../observability/relay-host-log-digest.js' +import type { RelayRuntimeObserver } from '../observability/relay-observability.js' import { REGIONAL_REHOME_TRUST_PROBE_ATTEMPT_ID, REGIONAL_REHOME_TRUST_PROBE_HOST_ID, REGIONAL_REHOME_TRUST_PROBE_USER_ID -} from './regional-rehome-trust-probe.js' -import type { RelayTokenClaims } from './relay-token-verifier.js' +} from '../assignment/regional-rehome/regional-rehome-trust-probe.js' +import type { RelayTokenClaims } from '../authentication/relay-token-verifier.js' import { ProcessQueuedByteBudget } from './splice-forwarder.js' // A due renewal leaves the heartbeat as a batch enqueue, so the store only sees diff --git a/cloud/apps/relay/src/host-session-registry.ts b/cloud/apps/relay/src/connections/host-session-registry.ts similarity index 97% rename from cloud/apps/relay/src/host-session-registry.ts rename to cloud/apps/relay/src/connections/host-session-registry.ts index 787e2b7b63e..2d26c072065 100644 --- a/cloud/apps/relay/src/host-session-registry.ts +++ b/cloud/apps/relay/src/connections/host-session-registry.ts @@ -1,57 +1,40 @@ import { createHash, createHmac, randomBytes, randomUUID, timingSafeEqual } from 'node:crypto' -import { - ASSIGNMENT_LIMITS, - RELAY_DEFAULT_REGION, - AuthRefreshSchema, - buildHostChallengePlaintext, - buildHostProofMacInput, - buildHostProofTranscript, - CONTROL_CONTINUITY_LIMITS, - DeviceCredentialInstallSchema, - DeviceCredentialInstallStatusSchema, - DeviceResumeConfirmSchema, - DeviceRevokeSchema, - HostChallengeAckSchema, - HostHelloSchema, - InviteCreateSchema, - RELAY_HOST_CAPABILITY_PENDING_CONN_DETAILS, - RELAY_HOST_CAPABILITY_IDLE_REGIONAL_REHOME, - RELAY_PROTOCOL_LIMITS, - RELAY_CLOSE_CODE, - RELAY_PHONE_CLOSE_REASON, - type IdleRegionalRehomeCommit, - type IdleRegionalRehomeDeferReason, - type IdleRegionalRehomeResult, - type RelayHostCloseReason, - type RelayPhoneCloseReason, - type RelayRegion -} from '@orca-cloud/relay-contract' +import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invariants' +import { RELAY_DEFAULT_REGION, type RelayRegion } from '@orca-cloud/relay-contract/relay-regions' +import { AuthRefreshSchema, DeviceRevokeSchema, HostChallengeAckSchema, HostHelloSchema, InviteCreateSchema, RELAY_HOST_CAPABILITY_PENDING_CONN_DETAILS, RELAY_HOST_CAPABILITY_IDLE_REGIONAL_REHOME } from '@orca-cloud/relay-contract/control-messages' +import { buildHostChallengePlaintext, buildHostProofMacInput, buildHostProofTranscript } from '@orca-cloud/relay-contract/host-proof-transcript' +import { CONTROL_CONTINUITY_LIMITS } from '@orca-cloud/relay-contract/control-continuity' +import { DeviceCredentialInstallSchema, DeviceCredentialInstallStatusSchema, DeviceResumeConfirmSchema } from '@orca-cloud/relay-contract/credential-messages' +import { RELAY_PROTOCOL_LIMITS } from '@orca-cloud/relay-contract/protocol-limits' +import { RELAY_CLOSE_CODE, RELAY_PHONE_CLOSE_REASON, type RelayPhoneCloseReason } from '@orca-cloud/relay-contract/close-codes' +import type { IdleRegionalRehomeCommit, IdleRegionalRehomeDeferReason, IdleRegionalRehomeResult } from '@orca-cloud/relay-contract/idle-regional-rehome' +import type { RelayHostCloseReason } from '@orca-cloud/relay-contract/host-close-reason' import nacl from 'tweetnacl' import type WebSocket from 'ws' import type { RawData } from 'ws' -import type { RelayConfig } from './config.js' -import type { AssignmentLeaseClass } from './assignment/assignment-lease.js' -import type { AssignmentLeaseShadow } from './assignment/assignment-lease-shadow.js' -import type { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { CellAdmitMode, CellReserveBook } from './cell-reserve-book.js' -import type { DemoteRequest, ReserveOutcome, ReserveRequest } from './cell-reserve-contract.js' -import { SeatDriftConfirmation, unbackedSeatReason, type UnbackedSeatReason } from './cell-seat-drift.js' -import { CellSeatLog, type CellSeat, type CellSeatChange, type CellSeatFeedPage } from './cell-seat-log.js' -import { isRelayDatabaseTransientError } from './database.js' +import type { RelayConfig } from '../config.js' +import type { AssignmentLeaseClass } from '../assignment/assignment-lease.js' +import type { AssignmentLeaseShadow } from '../assignment/assignment-lease-shadow.js' +import type { RelayAssignmentStore } from '../assignment/assignment-store.js' +import type { CellAdmitMode, CellReserveBook } from '../cell/reservations/cell-reserve-book.js' +import type { DemoteRequest, ReserveOutcome, ReserveRequest } from '../cell/reservations/cell-reserve-contract.js' +import { SeatDriftConfirmation, unbackedSeatReason, type UnbackedSeatReason } from '../cell/seats/cell-seat-drift.js' +import { CellSeatLog, type CellSeat, type CellSeatChange, type CellSeatFeedPage } from '../cell/seats/cell-seat-log.js' +import { isRelayDatabaseTransientError } from '../database/database.js' import { printableCloseReason } from './control-close-reason-text.js' -import { ControlRenewalBatch } from './control-renewal-batch.js' -import { RelayCredentialStore, RelayStoreError, type CredentialReservation } from './credential-store.js' +import { ControlRenewalBatch } from '../control-leases/control-renewal-batch.js' +import { RelayStoreError, type RelayCredentialStore, type CredentialReservation } from '../credentials/credential-store.js' import { HostCloseReasonMemory } from './host-close-reason-memory.js' -import { MemoryResumeConfirmations } from './memory-resume-confirmations.js' -import { PhoneConnectionLog, type PhoneDatabaseCause } from './phone-connection-log.js' +import { MemoryResumeConfirmations } from '../credentials/memory-resume-confirmations.js' +import { PhoneConnectionLog, type PhoneDatabaseCause } from '../observability/phone-connection-log.js' import { postProofCloseCause, PostProofCloseLog, type PostProofCloseCause -} from './post-proof-close-log.js' -import { describeRelayFailure, relayErrorSlug } from './relay-error-redaction.js' -import { relayHostLogDigest } from './relay-host-log-digest.js' -import type { RelayTokenClaims } from './relay-token-verifier.js' +} from '../observability/post-proof-close-log.js' +import { describeRelayFailure, relayErrorSlug } from '../observability/relay-error-redaction.js' +import { relayHostLogDigest } from '../observability/relay-host-log-digest.js' +import type { RelayTokenClaims } from '../authentication/relay-token-verifier.js' import { percentile, type HostPreAuthOutcome, @@ -59,7 +42,7 @@ import { type RelayClientAcceptStage, type RelayClientAcceptTimedStage, type RelayRuntimeObserver -} from './relay-observability.js' +} from '../observability/relay-observability.js' import type { PendingHostDataReservation } from './relay-connection-ledger.js' import { closeRelayWebSocket } from './relay-websocket-close.js' import { ProcessQueuedByteBudget, wireSplice } from './splice-forwarder.js' diff --git a/cloud/apps/relay/src/host-signed-out-rejection.test.ts b/cloud/apps/relay/src/connections/host-signed-out-rejection.test.ts similarity index 90% rename from cloud/apps/relay/src/host-signed-out-rejection.test.ts rename to cloud/apps/relay/src/connections/host-signed-out-rejection.test.ts index a74bed925e7..d9876c2eab1 100644 --- a/cloud/apps/relay/src/host-signed-out-rejection.test.ts +++ b/cloud/apps/relay/src/connections/host-signed-out-rejection.test.ts @@ -1,17 +1,15 @@ import { EventEmitter } from 'node:events' -import { - CONTROL_CONTINUITY_LIMITS, - RELAY_CLOSE_CODE, - RELAY_HOST_CLOSE_REASON -} from '@orca-cloud/relay-contract' +import { CONTROL_CONTINUITY_LIMITS } from '@orca-cloud/relay-contract/control-continuity' +import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes' +import { RELAY_HOST_CLOSE_REASON } from '@orca-cloud/relay-contract/host-close-reason' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type WebSocket from 'ws' -import type { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { RelayConfig } from './config.js' -import type { RelayCredentialStore } from './credential-store.js' +import type { RelayAssignmentStore } from '../assignment/assignment-store.js' +import type { RelayConfig } from '../config.js' +import type { RelayCredentialStore } from '../credentials/credential-store.js' import { HostSessionRegistry } from './host-session-registry.js' -import type { RelayRuntimeObserver } from './relay-observability.js' -import type { RelayTokenClaims } from './relay-token-verifier.js' +import type { RelayRuntimeObserver } from '../observability/relay-observability.js' +import type { RelayTokenClaims } from '../authentication/relay-token-verifier.js' import { ProcessQueuedByteBudget } from './splice-forwarder.js' class FakeSocket extends EventEmitter { diff --git a/cloud/apps/relay/src/relay-connection-hard-cap.blackbox.test.ts b/cloud/apps/relay/src/connections/relay-connection-hard-cap.blackbox.test.ts similarity index 97% rename from cloud/apps/relay/src/relay-connection-hard-cap.blackbox.test.ts rename to cloud/apps/relay/src/connections/relay-connection-hard-cap.blackbox.test.ts index 230711e27d8..a75bd69bba3 100644 --- a/cloud/apps/relay/src/relay-connection-hard-cap.blackbox.test.ts +++ b/cloud/apps/relay/src/connections/relay-connection-hard-cap.blackbox.test.ts @@ -5,17 +5,14 @@ import { createServer, type Server } from 'node:http' import { createServer as createNetServer } from 'node:net' import { tmpdir } from 'node:os' import { join } from 'node:path' -import { - buildHostProofMacInput, - HOST_CHALLENGE_PLAINTEXT_DOMAIN -} from '@orca-cloud/relay-contract' +import { buildHostProofMacInput, HOST_CHALLENGE_PLAINTEXT_DOMAIN } from '@orca-cloud/relay-contract/host-proof-transcript' import nacl from 'tweetnacl' import { afterEach, describe, expect, it, vi } from 'vitest' import WebSocket from 'ws' import type { RawData } from 'ws' -import type { RelayConfig } from './config.js' -import { openRelayDatabase, type RelayDatabase } from './database.js' -import { createRelayServer } from './relay-server.js' +import type { RelayConfig } from '../config.js' +import { openRelayDatabase, type RelayDatabase } from '../database/database.js' +import { createRelayServer } from '../relay-server.js' async function unusedPort(): Promise { const server = createNetServer() diff --git a/cloud/apps/relay/src/relay-connection-ledger.test.ts b/cloud/apps/relay/src/connections/relay-connection-ledger.test.ts similarity index 100% rename from cloud/apps/relay/src/relay-connection-ledger.test.ts rename to cloud/apps/relay/src/connections/relay-connection-ledger.test.ts diff --git a/cloud/apps/relay/src/relay-connection-ledger.ts b/cloud/apps/relay/src/connections/relay-connection-ledger.ts similarity index 100% rename from cloud/apps/relay/src/relay-connection-ledger.ts rename to cloud/apps/relay/src/connections/relay-connection-ledger.ts diff --git a/cloud/apps/relay/src/relay-first-frame-close.blackbox.test.ts b/cloud/apps/relay/src/connections/relay-first-frame-close.blackbox.test.ts similarity index 96% rename from cloud/apps/relay/src/relay-first-frame-close.blackbox.test.ts rename to cloud/apps/relay/src/connections/relay-first-frame-close.blackbox.test.ts index e47e9bb8eb4..218809f12a7 100644 --- a/cloud/apps/relay/src/relay-first-frame-close.blackbox.test.ts +++ b/cloud/apps/relay/src/connections/relay-first-frame-close.blackbox.test.ts @@ -1,9 +1,10 @@ import { connect, type Socket } from 'node:net' import { afterEach, expect, it, vi } from 'vitest' -import { RELAY_CLOSE_CODE, RELAY_PROTOCOL_LIMITS } from '@orca-cloud/relay-contract' -import { loadRelayConfig } from './config.js' -import type { RelayDatabase } from './database.js' -import { createRelayServer } from './relay-server.js' +import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes' +import { RELAY_PROTOCOL_LIMITS } from '@orca-cloud/relay-contract/protocol-limits' +import { loadRelayConfig } from '../config.js' +import type { RelayDatabase } from '../database/database.js' +import { createRelayServer } from '../relay-server.js' const cleanups: (() => Promise | void)[] = [] afterEach(async () => { diff --git a/cloud/apps/relay/src/relay-first-frame-failure.blackbox.test.ts b/cloud/apps/relay/src/connections/relay-first-frame-failure.blackbox.test.ts similarity index 94% rename from cloud/apps/relay/src/relay-first-frame-failure.blackbox.test.ts rename to cloud/apps/relay/src/connections/relay-first-frame-failure.blackbox.test.ts index ac1cf7fe110..af1903cf2e7 100644 --- a/cloud/apps/relay/src/relay-first-frame-failure.blackbox.test.ts +++ b/cloud/apps/relay/src/connections/relay-first-frame-failure.blackbox.test.ts @@ -1,10 +1,10 @@ import { createServer as createNetServer } from 'node:net' -import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract' +import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes' import { afterEach, describe, expect, it, vi } from 'vitest' import WebSocket from 'ws' -import type { RelayConfig } from './config.js' -import type { RelayDatabase } from './database.js' -import { createRelayServer } from './relay-server.js' +import type { RelayConfig } from '../config.js' +import type { RelayDatabase } from '../database/database.js' +import { createRelayServer } from '../relay-server.js' async function unusedPort(): Promise { const server = createNetServer() diff --git a/cloud/apps/relay/src/relay-host-hello-shed.test.ts b/cloud/apps/relay/src/connections/relay-host-hello-shed.test.ts similarity index 98% rename from cloud/apps/relay/src/relay-host-hello-shed.test.ts rename to cloud/apps/relay/src/connections/relay-host-hello-shed.test.ts index db0dc09a56a..8f7251203be 100644 --- a/cloud/apps/relay/src/relay-host-hello-shed.test.ts +++ b/cloud/apps/relay/src/connections/relay-host-hello-shed.test.ts @@ -5,10 +5,10 @@ import { exportJWK, generateKeyPair, SignJWT } from 'jose' import nacl from 'tweetnacl' import { afterEach, describe, expect, it, vi } from 'vitest' import WebSocket from 'ws' -import type { RelayConfig } from './config.js' -import { PostgresDatabase } from './database.js' +import type { RelayConfig } from '../config.js' +import { PostgresDatabase } from '../database/database.js' import { HostSessionRegistry } from './host-session-registry.js' -import { createRelayServer, HOST_HELLO_SHED_OLDEST_WAIT_MS } from './relay-server.js' +import { createRelayServer, HOST_HELLO_SHED_OLDEST_WAIT_MS } from '../relay-server.js' async function unusedPort(): Promise { const server = createNetServer() diff --git a/cloud/apps/relay/src/relay-host-proof-failure.blackbox.test.ts b/cloud/apps/relay/src/connections/relay-host-proof-failure.blackbox.test.ts similarity index 95% rename from cloud/apps/relay/src/relay-host-proof-failure.blackbox.test.ts rename to cloud/apps/relay/src/connections/relay-host-proof-failure.blackbox.test.ts index 128e07d23a2..c9da8447fa9 100644 --- a/cloud/apps/relay/src/relay-host-proof-failure.blackbox.test.ts +++ b/cloud/apps/relay/src/connections/relay-host-proof-failure.blackbox.test.ts @@ -2,13 +2,13 @@ import { createHash } from 'node:crypto' import { createServer, type Server } from 'node:http' import { createServer as createNetServer } from 'node:net' import { exportJWK, generateKeyPair, SignJWT } from 'jose' -import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract' +import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes' import nacl from 'tweetnacl' import { afterEach, describe, expect, it, vi } from 'vitest' import WebSocket from 'ws' -import type { RelayConfig } from './config.js' -import type { RelayDatabase } from './database.js' -import { createRelayServer } from './relay-server.js' +import type { RelayConfig } from '../config.js' +import type { RelayDatabase } from '../database/database.js' +import { createRelayServer } from '../relay-server.js' async function unusedPort(): Promise { const server = createNetServer() diff --git a/cloud/apps/relay/src/relay-upgrade-malformed-uri.blackbox.test.ts b/cloud/apps/relay/src/connections/relay-upgrade-malformed-uri.blackbox.test.ts similarity index 96% rename from cloud/apps/relay/src/relay-upgrade-malformed-uri.blackbox.test.ts rename to cloud/apps/relay/src/connections/relay-upgrade-malformed-uri.blackbox.test.ts index 0b25ff62948..4973726aede 100644 --- a/cloud/apps/relay/src/relay-upgrade-malformed-uri.blackbox.test.ts +++ b/cloud/apps/relay/src/connections/relay-upgrade-malformed-uri.blackbox.test.ts @@ -1,8 +1,8 @@ import { connect, createServer as createNetServer } from 'node:net' import { afterEach, describe, expect, it, vi } from 'vitest' -import type { RelayConfig } from './config.js' -import type { RelayDatabase } from './database.js' -import { createRelayServer } from './relay-server.js' +import type { RelayConfig } from '../config.js' +import type { RelayDatabase } from '../database/database.js' +import { createRelayServer } from '../relay-server.js' async function unusedPort(): Promise { const server = createNetServer() diff --git a/cloud/apps/relay/src/relay-websocket-close.test.ts b/cloud/apps/relay/src/connections/relay-websocket-close.test.ts similarity index 100% rename from cloud/apps/relay/src/relay-websocket-close.test.ts rename to cloud/apps/relay/src/connections/relay-websocket-close.test.ts diff --git a/cloud/apps/relay/src/relay-websocket-close.ts b/cloud/apps/relay/src/connections/relay-websocket-close.ts similarity index 100% rename from cloud/apps/relay/src/relay-websocket-close.ts rename to cloud/apps/relay/src/connections/relay-websocket-close.ts diff --git a/cloud/apps/relay/src/splice-forwarder.test.ts b/cloud/apps/relay/src/connections/splice-forwarder.test.ts similarity index 97% rename from cloud/apps/relay/src/splice-forwarder.test.ts rename to cloud/apps/relay/src/connections/splice-forwarder.test.ts index b17fa114aea..e47aac7710a 100644 --- a/cloud/apps/relay/src/splice-forwarder.test.ts +++ b/cloud/apps/relay/src/connections/splice-forwarder.test.ts @@ -4,11 +4,11 @@ import type { Writable } from 'node:stream' import { afterEach, describe, expect, it, vi } from 'vitest' import type WebSocket from 'ws' import type { RawData } from 'ws' -import { RELAY_ADMISSION_BUDGETS } from '@orca-cloud/relay-contract' +import { RELAY_ADMISSION_BUDGETS } from '@orca-cloud/relay-contract/admission-budgets' import { ProcessQueuedByteBudget, wireSplice } from './splice-forwarder.js' // SAFETY: ws exports Receiver at runtime; its published types omit this Writable constructor. -const { Receiver } = createRequire(import.meta.url)('ws') as { +const { Receiver } = createRequire(new URL('../splice-forwarder.test.ts', import.meta.url))('ws') as { Receiver: new (options: { isServer: true }) => Writable } diff --git a/cloud/apps/relay/src/splice-forwarder.ts b/cloud/apps/relay/src/connections/splice-forwarder.ts similarity index 97% rename from cloud/apps/relay/src/splice-forwarder.ts rename to cloud/apps/relay/src/connections/splice-forwarder.ts index 3afd9003dce..198177b0b86 100644 --- a/cloud/apps/relay/src/splice-forwarder.ts +++ b/cloud/apps/relay/src/connections/splice-forwarder.ts @@ -1,4 +1,5 @@ -import { RELAY_ADMISSION_BUDGETS, RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract' +import { RELAY_ADMISSION_BUDGETS } from '@orca-cloud/relay-contract/admission-budgets' +import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes' import type WebSocket from 'ws' import type { RawData } from 'ws' import { closeRelayWebSocket } from './relay-websocket-close.js' diff --git a/cloud/apps/relay/src/connection-reservation-debt-retention.test.ts b/cloud/apps/relay/src/control-leases/connection-reservation-debt-retention.test.ts similarity index 96% rename from cloud/apps/relay/src/connection-reservation-debt-retention.test.ts rename to cloud/apps/relay/src/control-leases/connection-reservation-debt-retention.test.ts index df206c53b6c..d374bd9b871 100644 --- a/cloud/apps/relay/src/connection-reservation-debt-retention.test.ts +++ b/cloud/apps/relay/src/control-leases/connection-reservation-debt-retention.test.ts @@ -1,7 +1,7 @@ import { afterEach, describe, expect, it } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { RelayCellConfig } from './config.js' -import { openInMemoryRelayDatabase, type RelayDatabase } from './database.js' +import { RelayAssignmentStore } from '../assignment/assignment-store.js' +import type { RelayCellConfig } from '../config.js' +import { openInMemoryRelayDatabase, type RelayDatabase } from '../database/database.js' const DEBT_RETENTION_MS = 10 * 60 * 1_000 diff --git a/cloud/apps/relay/src/control-accept-cell-row-lock-postgres.test.ts b/cloud/apps/relay/src/control-leases/control-accept-cell-row-lock-postgres.test.ts similarity index 97% rename from cloud/apps/relay/src/control-accept-cell-row-lock-postgres.test.ts rename to cloud/apps/relay/src/control-leases/control-accept-cell-row-lock-postgres.test.ts index bea827515c6..e91849f06b4 100644 --- a/cloud/apps/relay/src/control-accept-cell-row-lock-postgres.test.ts +++ b/cloud/apps/relay/src/control-leases/control-accept-cell-row-lock-postgres.test.ts @@ -1,9 +1,9 @@ import pg from 'pg' import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { RelayConfig } from './config.js' -import { openRelayDatabase, type RelayDatabase } from './database.js' -import { createRelayServer } from './relay-server.js' +import { RelayAssignmentStore } from '../assignment/assignment-store.js' +import type { RelayConfig } from '../config.js' +import { openRelayDatabase, type RelayDatabase } from '../database/database.js' +import { createRelayServer } from '../relay-server.js' const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL const describePostgres = databaseUrl ? describe : describe.skip diff --git a/cloud/apps/relay/src/control-accept-cell-row-lock.test.ts b/cloud/apps/relay/src/control-leases/control-accept-cell-row-lock.test.ts similarity index 96% rename from cloud/apps/relay/src/control-accept-cell-row-lock.test.ts rename to cloud/apps/relay/src/control-leases/control-accept-cell-row-lock.test.ts index 3a2ed0781c1..c21ffa2c56f 100644 --- a/cloud/apps/relay/src/control-accept-cell-row-lock.test.ts +++ b/cloud/apps/relay/src/control-leases/control-accept-cell-row-lock.test.ts @@ -1,13 +1,13 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest' -import type { RelayCellConfig } from './config.js' -import { RelayAssignmentStore } from './assignment/assignment-store.js' +import type { RelayCellConfig } from '../config.js' +import { RelayAssignmentStore } from '../assignment/assignment-store.js' import { openInMemoryRelayDatabase, type RelayDatabase, type RelayLockOptions, type RelayTransactionOptions, type SqlRow -} from './database.js' +} from '../database/database.js' const CELL: RelayCellConfig = { id: 'accept-cell-a', diff --git a/cloud/apps/relay/src/control-lease-recovery-postgres.test.ts b/cloud/apps/relay/src/control-leases/control-lease-recovery-postgres.test.ts similarity index 90% rename from cloud/apps/relay/src/control-lease-recovery-postgres.test.ts rename to cloud/apps/relay/src/control-leases/control-lease-recovery-postgres.test.ts index ce3b8638459..a91f0ed85a0 100644 --- a/cloud/apps/relay/src/control-lease-recovery-postgres.test.ts +++ b/cloud/apps/relay/src/control-leases/control-lease-recovery-postgres.test.ts @@ -1,16 +1,17 @@ import { EventEmitter } from 'node:events' -import { ASSIGNMENT_LIMITS, RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract' +import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invariants' +import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes' import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest' import type WebSocket from 'ws' -import { RelayAssignmentStore } from './assignment/assignment-store.js' +import { RelayAssignmentStore } from '../assignment/assignment-store.js' import { CONTROL_RENEWAL_BATCH_INTERVAL_MS } from './control-renewal-batch.js' -import type { RelayConfig } from './config.js' -import type { RelayCredentialStore } from './credential-store.js' -import { openRelayDatabase, type RelayDatabase } from './database.js' -import { HostSessionRegistry, type HostSession } from './host-session-registry.js' -import type { RelayRuntimeObserver } from './relay-observability.js' -import type { RelayTokenClaims } from './relay-token-verifier.js' -import { ProcessQueuedByteBudget } from './splice-forwarder.js' +import type { RelayConfig } from '../config.js' +import type { RelayCredentialStore } from '../credentials/credential-store.js' +import { openRelayDatabase, type RelayDatabase } from '../database/database.js' +import { HostSessionRegistry, type HostSession } from '../connections/host-session-registry.js' +import type { RelayRuntimeObserver } from '../observability/relay-observability.js' +import type { RelayTokenClaims } from '../authentication/relay-token-verifier.js' +import { ProcessQueuedByteBudget } from '../connections/splice-forwarder.js' const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL const describePostgres = databaseUrl ? describe : describe.skip diff --git a/cloud/apps/relay/src/control-rebind-inventory-lock-postgres.test.ts b/cloud/apps/relay/src/control-leases/control-rebind-inventory-lock-postgres.test.ts similarity index 98% rename from cloud/apps/relay/src/control-rebind-inventory-lock-postgres.test.ts rename to cloud/apps/relay/src/control-leases/control-rebind-inventory-lock-postgres.test.ts index 6a76efcdac1..d24d6d71839 100644 --- a/cloud/apps/relay/src/control-rebind-inventory-lock-postgres.test.ts +++ b/cloud/apps/relay/src/control-leases/control-rebind-inventory-lock-postgres.test.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, describe, expect, it } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import { openRelayDatabase, type RelayDatabase } from './database.js' +import { RelayAssignmentStore } from '../assignment/assignment-store.js' +import { openRelayDatabase, type RelayDatabase } from '../database/database.js' const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL const describePostgres = databaseUrl ? describe : describe.skip diff --git a/cloud/apps/relay/src/control-renewal-batch-store.test.ts b/cloud/apps/relay/src/control-leases/control-renewal-batch-store.test.ts similarity index 97% rename from cloud/apps/relay/src/control-renewal-batch-store.test.ts rename to cloud/apps/relay/src/control-leases/control-renewal-batch-store.test.ts index 27f4dcfc17c..a94e286aa1b 100644 --- a/cloud/apps/relay/src/control-renewal-batch-store.test.ts +++ b/cloud/apps/relay/src/control-leases/control-renewal-batch-store.test.ts @@ -1,8 +1,8 @@ -import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract' +import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invariants' import { describe, expect, it, vi } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' +import { RelayAssignmentStore } from '../assignment/assignment-store.js' import type { ControlRenewalOutcome } from './control-renewal-statement.js' -import { openInMemoryRelayDatabase, type RelayDatabase, type SqlRow } from './database.js' +import { openInMemoryRelayDatabase, type RelayDatabase, type SqlRow } from '../database/database.js' const now = 1_900_000_000_000 const expiresAt = now + 105_000 diff --git a/cloud/apps/relay/src/control-renewal-batch.test.ts b/cloud/apps/relay/src/control-leases/control-renewal-batch.test.ts similarity index 100% rename from cloud/apps/relay/src/control-renewal-batch.test.ts rename to cloud/apps/relay/src/control-leases/control-renewal-batch.test.ts diff --git a/cloud/apps/relay/src/control-renewal-batch.ts b/cloud/apps/relay/src/control-leases/control-renewal-batch.ts similarity index 100% rename from cloud/apps/relay/src/control-renewal-batch.ts rename to cloud/apps/relay/src/control-leases/control-renewal-batch.ts diff --git a/cloud/apps/relay/src/control-renewal-postgres.test.ts b/cloud/apps/relay/src/control-leases/control-renewal-postgres.test.ts similarity index 98% rename from cloud/apps/relay/src/control-renewal-postgres.test.ts rename to cloud/apps/relay/src/control-leases/control-renewal-postgres.test.ts index 827c12c10da..6900d4c5352 100644 --- a/cloud/apps/relay/src/control-renewal-postgres.test.ts +++ b/cloud/apps/relay/src/control-leases/control-renewal-postgres.test.ts @@ -1,7 +1,8 @@ import { performance } from 'node:perf_hooks' -import { ASSIGNMENT_LIMITS, RELAY_PROTOCOL_LIMITS } from '@orca-cloud/relay-contract' +import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invariants' +import { RELAY_PROTOCOL_LIMITS } from '@orca-cloud/relay-contract/protocol-limits' import { afterAll, beforeAll, describe, expect, it } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' +import { RelayAssignmentStore } from '../assignment/assignment-store.js' import { CONTROL_RENEWAL_BATCH_SQL } from './control-renewal-statement.js' import { openRelayDatabase, @@ -9,7 +10,7 @@ import { type RelayDatabase, type RelayLockOptions, type SqlRow -} from './database.js' +} from '../database/database.js' const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL const describePostgres = databaseUrl ? describe : describe.skip diff --git a/cloud/apps/relay/src/control-renewal-statement.ts b/cloud/apps/relay/src/control-leases/control-renewal-statement.ts similarity index 98% rename from cloud/apps/relay/src/control-renewal-statement.ts rename to cloud/apps/relay/src/control-leases/control-renewal-statement.ts index b162d60610e..4a060c70a1d 100644 --- a/cloud/apps/relay/src/control-renewal-statement.ts +++ b/cloud/apps/relay/src/control-leases/control-renewal-statement.ts @@ -1,5 +1,5 @@ -import type { AssignmentIdentity } from './assignment/assignment-identity-queue.js' -import type { SqlRow } from './database.js' +import type { AssignmentIdentity } from '../assignment/assignment-identity-queue.js' +import type { SqlRow } from '../database/database.js' export type ControlRenewalOutcome = | 'renewed' diff --git a/cloud/apps/relay/src/control-reservation-reconnect-claim.test.ts b/cloud/apps/relay/src/control-leases/control-reservation-reconnect-claim.test.ts similarity index 97% rename from cloud/apps/relay/src/control-reservation-reconnect-claim.test.ts rename to cloud/apps/relay/src/control-leases/control-reservation-reconnect-claim.test.ts index 6c56fa5c317..abc4cb147c4 100644 --- a/cloud/apps/relay/src/control-reservation-reconnect-claim.test.ts +++ b/cloud/apps/relay/src/control-leases/control-reservation-reconnect-claim.test.ts @@ -1,11 +1,11 @@ import { afterEach, describe, expect, it } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' -import type { RelayCellConfig } from './config.js' +import { RelayAssignmentStore } from '../assignment/assignment-store.js' +import type { RelayCellConfig } from '../config.js' import { openInMemoryRelayDatabase, openRelayDatabase, type RelayDatabase -} from './database.js' +} from '../database/database.js' const KEY_PREFIX = 'reconnect-claim' const USER_ID = `${KEY_PREFIX}-user-1` diff --git a/cloud/apps/relay/src/released-reservation-prune.test.ts b/cloud/apps/relay/src/control-leases/released-reservation-prune.test.ts similarity index 98% rename from cloud/apps/relay/src/released-reservation-prune.test.ts rename to cloud/apps/relay/src/control-leases/released-reservation-prune.test.ts index 456f262a510..5c66c375023 100644 --- a/cloud/apps/relay/src/released-reservation-prune.test.ts +++ b/cloud/apps/relay/src/control-leases/released-reservation-prune.test.ts @@ -3,13 +3,13 @@ import { afterAll, afterEach, describe, expect, it } from 'vitest' import { RelayAssignmentStore, RELEASED_CONTROL_RESERVATION_RETENTION_MS -} from './assignment/assignment-store.js' +} from '../assignment/assignment-store.js' import { openInMemoryRelayDatabase, openRelayDatabase, type RelayDatabase -} from './database.js' -import { HeapWindowReaper } from './heap-window-reaper.js' +} from '../database/database.js' +import { HeapWindowReaper } from '../credentials/heap-window-reaper.js' // Unpruned released rows reached 13.7M/9GB and were locked on every host placement. const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL diff --git a/cloud/apps/relay/src/credential-cleanup-sweep-postgres.test.ts b/cloud/apps/relay/src/credentials/credential-cleanup-sweep-postgres.test.ts similarity index 99% rename from cloud/apps/relay/src/credential-cleanup-sweep-postgres.test.ts rename to cloud/apps/relay/src/credentials/credential-cleanup-sweep-postgres.test.ts index ad34d179b81..3ff17806a57 100644 --- a/cloud/apps/relay/src/credential-cleanup-sweep-postgres.test.ts +++ b/cloud/apps/relay/src/credentials/credential-cleanup-sweep-postgres.test.ts @@ -6,7 +6,7 @@ import { RelayCredentialStore, type RelayIdentity } from './credential-store.js' -import { openRelayDatabase, type RelayDatabase } from './database.js' +import { openRelayDatabase, type RelayDatabase } from '../database/database.js' // Real planner/ctid coverage: 23 cells’ 30s invite sweeps once scanned the whole table; partial indexes must remove those scans. const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL diff --git a/cloud/apps/relay/src/credential-store-cleanup.test.ts b/cloud/apps/relay/src/credentials/credential-store-cleanup.test.ts similarity index 99% rename from cloud/apps/relay/src/credential-store-cleanup.test.ts rename to cloud/apps/relay/src/credentials/credential-store-cleanup.test.ts index 5feff4a4713..b87487e4d7f 100644 --- a/cloud/apps/relay/src/credential-store-cleanup.test.ts +++ b/cloud/apps/relay/src/credentials/credential-store-cleanup.test.ts @@ -6,7 +6,7 @@ import { RelayCredentialStore, type RelayIdentity } from './credential-store.js' -import { openInMemoryRelayDatabase, type RelayDatabase } from './database.js' +import { openInMemoryRelayDatabase, type RelayDatabase } from '../database/database.js' const identity: RelayIdentity = { userId: 'user-1', relayHostId: 'abcdefghijklmnop' } const DAY_MS = 24 * 60 * 60 * 1000 diff --git a/cloud/apps/relay/src/credential-store.test.ts b/cloud/apps/relay/src/credentials/credential-store.test.ts similarity index 99% rename from cloud/apps/relay/src/credential-store.test.ts rename to cloud/apps/relay/src/credentials/credential-store.test.ts index 74628ec0a89..43b4528d657 100644 --- a/cloud/apps/relay/src/credential-store.test.ts +++ b/cloud/apps/relay/src/credentials/credential-store.test.ts @@ -5,7 +5,7 @@ import { type CredentialReservation, type RelayIdentity } from './credential-store.js' -import { openInMemoryRelayDatabase, type RelayDatabase } from './database.js' +import { openInMemoryRelayDatabase, type RelayDatabase } from '../database/database.js' const identity: RelayIdentity = { userId: 'user-1', relayHostId: 'abcdefghijklmnop' } const relayDeviceId = 'device-1' diff --git a/cloud/apps/relay/src/credential-store.ts b/cloud/apps/relay/src/credentials/credential-store.ts similarity index 99% rename from cloud/apps/relay/src/credential-store.ts rename to cloud/apps/relay/src/credentials/credential-store.ts index 92c36c026f1..b85e6897bb0 100644 --- a/cloud/apps/relay/src/credential-store.ts +++ b/cloud/apps/relay/src/credentials/credential-store.ts @@ -1,11 +1,8 @@ import { createHash, randomBytes, randomUUID, timingSafeEqual } from 'node:crypto' -import { - decideResumeCommit, - RELAY_PROTOCOL_LIMITS, - type DeviceCredentialInstalled, - type DeviceResumeConfirmed -} from '@orca-cloud/relay-contract' -import type { RelayDatabase, SqlRow } from './database.js' +import { decideResumeCommit } from '@orca-cloud/relay-contract/persistence-invariants' +import { RELAY_PROTOCOL_LIMITS } from '@orca-cloud/relay-contract/protocol-limits' +import type { DeviceCredentialInstalled, DeviceResumeConfirmed } from '@orca-cloud/relay-contract/credential-messages' +import type { RelayDatabase, SqlRow } from '../database/database.js' import { changes, HeapWindowReaper } from './heap-window-reaper.js' import { ResumeConfirmedAuditBuffer } from './resume-confirmed-audit-buffer.js' diff --git a/cloud/apps/relay/src/heap-window-reaper.ts b/cloud/apps/relay/src/credentials/heap-window-reaper.ts similarity index 97% rename from cloud/apps/relay/src/heap-window-reaper.ts rename to cloud/apps/relay/src/credentials/heap-window-reaper.ts index 1c78fdc9860..5a53cb867d7 100644 --- a/cloud/apps/relay/src/heap-window-reaper.ts +++ b/cloud/apps/relay/src/credentials/heap-window-reaper.ts @@ -1,5 +1,5 @@ import { performance } from 'node:perf_hooks' -import type { RelayDatabase, SqlRow } from './database.js' +import type { RelayDatabase, SqlRow } from '../database/database.js' export type HeapWindowReapBudget = { // Pages one DELETE may visit, so its row locks and WAL stay a few hundred rows. diff --git a/cloud/apps/relay/src/memory-resume-confirmations.ts b/cloud/apps/relay/src/credentials/memory-resume-confirmations.ts similarity index 99% rename from cloud/apps/relay/src/memory-resume-confirmations.ts rename to cloud/apps/relay/src/credentials/memory-resume-confirmations.ts index 1532f67effd..fbd7d9d0c35 100644 --- a/cloud/apps/relay/src/memory-resume-confirmations.ts +++ b/cloud/apps/relay/src/credentials/memory-resume-confirmations.ts @@ -1,4 +1,4 @@ -import type { DeviceResumeConfirmed } from '@orca-cloud/relay-contract' +import type { DeviceResumeConfirmed } from '@orca-cloud/relay-contract/credential-messages' import { RelayStoreError, type RelayCredentialStore, type RelayIdentity } from './credential-store.js' // Step 6: what a memory cell keeps instead of relay_connection_bases and relay_confirm_results. diff --git a/cloud/apps/relay/src/resume-confirmed-audit-buffer.test.ts b/cloud/apps/relay/src/credentials/resume-confirmed-audit-buffer.test.ts similarity index 97% rename from cloud/apps/relay/src/resume-confirmed-audit-buffer.test.ts rename to cloud/apps/relay/src/credentials/resume-confirmed-audit-buffer.test.ts index b6d1db7bf6e..14fcb4b87f0 100644 --- a/cloud/apps/relay/src/resume-confirmed-audit-buffer.test.ts +++ b/cloud/apps/relay/src/credentials/resume-confirmed-audit-buffer.test.ts @@ -1,5 +1,5 @@ import { afterEach, describe, expect, it, vi } from 'vitest' -import { openInMemoryRelayDatabase, type RelayDatabase, type SqlRow } from './database.js' +import { openInMemoryRelayDatabase, type RelayDatabase, type SqlRow } from '../database/database.js' import { RESUME_AUDIT_BUFFER_MAX_ROWS, RESUME_AUDIT_FLUSH_MS, @@ -7,7 +7,7 @@ import { RESUME_AUDIT_MAX_AGE_MS, ResumeConfirmedAuditBuffer } from './resume-confirmed-audit-buffer.js' -import { StatementRecordingDatabase } from './test-fixtures/statement-recording-database.js' +import { StatementRecordingDatabase } from '../test-fixtures/statement-recording-database.js' const event = (reqId: string) => ({ userId: 'user-1', diff --git a/cloud/apps/relay/src/resume-confirmed-audit-buffer.ts b/cloud/apps/relay/src/credentials/resume-confirmed-audit-buffer.ts similarity index 98% rename from cloud/apps/relay/src/resume-confirmed-audit-buffer.ts rename to cloud/apps/relay/src/credentials/resume-confirmed-audit-buffer.ts index 63a300c7f2a..26d24c973f1 100644 --- a/cloud/apps/relay/src/resume-confirmed-audit-buffer.ts +++ b/cloud/apps/relay/src/credentials/resume-confirmed-audit-buffer.ts @@ -1,5 +1,5 @@ import { randomUUID } from 'node:crypto' -import type { RelayDatabase } from './database.js' +import type { RelayDatabase } from '../database/database.js' // Batch audit writes off confirm’s round trips; unflushed rows are lost on crash/shutdown because exit flushing would race pool closure. export const RESUME_AUDIT_FLUSH_MS = 5_000 diff --git a/cloud/apps/relay/src/boot-database-open.test.ts b/cloud/apps/relay/src/database/boot-database-open.test.ts similarity index 100% rename from cloud/apps/relay/src/boot-database-open.test.ts rename to cloud/apps/relay/src/database/boot-database-open.test.ts diff --git a/cloud/apps/relay/src/boot-database-open.ts b/cloud/apps/relay/src/database/boot-database-open.ts similarity index 100% rename from cloud/apps/relay/src/boot-database-open.ts rename to cloud/apps/relay/src/database/boot-database-open.ts diff --git a/cloud/apps/relay/src/cell-inventory-hold-samples.test.ts b/cloud/apps/relay/src/database/cell-inventory-hold-samples.test.ts similarity index 100% rename from cloud/apps/relay/src/cell-inventory-hold-samples.test.ts rename to cloud/apps/relay/src/database/cell-inventory-hold-samples.test.ts diff --git a/cloud/apps/relay/src/cell-inventory-hold-samples.ts b/cloud/apps/relay/src/database/cell-inventory-hold-samples.ts similarity index 100% rename from cloud/apps/relay/src/cell-inventory-hold-samples.ts rename to cloud/apps/relay/src/database/cell-inventory-hold-samples.ts diff --git a/cloud/apps/relay/src/database-connect-stall-postgres.test.ts b/cloud/apps/relay/src/database/database-connect-stall-postgres.test.ts similarity index 100% rename from cloud/apps/relay/src/database-connect-stall-postgres.test.ts rename to cloud/apps/relay/src/database/database-connect-stall-postgres.test.ts diff --git a/cloud/apps/relay/src/database-postgres-timeout.test.ts b/cloud/apps/relay/src/database/database-postgres-timeout.test.ts similarity index 99% rename from cloud/apps/relay/src/database-postgres-timeout.test.ts rename to cloud/apps/relay/src/database/database-postgres-timeout.test.ts index 6018696247a..3975196b570 100644 --- a/cloud/apps/relay/src/database-postgres-timeout.test.ts +++ b/cloud/apps/relay/src/database/database-postgres-timeout.test.ts @@ -49,7 +49,7 @@ import { relayPostgresReadTimeoutMarginMs, relayPostgresStatementTimeoutMs } from './database.js' -import { applyPostgresSchema } from './postgres-schema-startup.js' +import { applyPostgresSchema } from '@orca-cloud/postgres-schema/apply-postgres-schema' const SCHEMA_POOL = { max: 1, diff --git a/cloud/apps/relay/src/database-startup-retry.ts b/cloud/apps/relay/src/database/database-startup-retry.ts similarity index 100% rename from cloud/apps/relay/src/database-startup-retry.ts rename to cloud/apps/relay/src/database/database-startup-retry.ts diff --git a/cloud/apps/relay/src/database-statement-timeout-postgres.test.ts b/cloud/apps/relay/src/database/database-statement-timeout-postgres.test.ts similarity index 100% rename from cloud/apps/relay/src/database-statement-timeout-postgres.test.ts rename to cloud/apps/relay/src/database/database-statement-timeout-postgres.test.ts diff --git a/cloud/apps/relay/src/database-transient-error.test.ts b/cloud/apps/relay/src/database/database-transient-error.test.ts similarity index 100% rename from cloud/apps/relay/src/database-transient-error.test.ts rename to cloud/apps/relay/src/database/database-transient-error.test.ts diff --git a/cloud/apps/relay/src/database.test.ts b/cloud/apps/relay/src/database/database.test.ts similarity index 100% rename from cloud/apps/relay/src/database.test.ts rename to cloud/apps/relay/src/database/database.test.ts diff --git a/cloud/apps/relay/src/database.ts b/cloud/apps/relay/src/database/database.ts similarity index 99% rename from cloud/apps/relay/src/database.ts rename to cloud/apps/relay/src/database/database.ts index 6436177617a..04f52cda7e1 100644 --- a/cloud/apps/relay/src/database.ts +++ b/cloud/apps/relay/src/database/database.ts @@ -3,7 +3,7 @@ import { performance } from 'node:perf_hooks' import { join } from 'node:path' import { DatabaseSync } from 'node:sqlite' import pg from 'pg' -import { RELAY_REGIONS } from '@orca-cloud/relay-contract' +import { RELAY_REGIONS } from '@orca-cloud/relay-contract/relay-regions' import { emptyPostgresPoolPressureCounts, isPostgresPoolConnectFailure, @@ -11,7 +11,7 @@ import { type PostgresPoolLane, type PostgresPoolPressureCounts } from './postgres-pool-pressure.js' -import { applyPostgresSchema } from './postgres-schema-startup.js' +import { applyPostgresSchema } from '@orca-cloud/postgres-schema/apply-postgres-schema' import { POSTGRES_STATEMENT_STATS_MIGRATION } from './postgres-statement-stats.js' import { reportPostgresQueryFailure } from './postgres-query-failure.js' import { noteStickySlotPoolWait, noteStickySlotStatement } from './sticky-slot-statements.js' diff --git a/cloud/apps/relay/src/dead-relay-tables-postgres.test.ts b/cloud/apps/relay/src/database/dead-relay-tables-postgres.test.ts similarity index 100% rename from cloud/apps/relay/src/dead-relay-tables-postgres.test.ts rename to cloud/apps/relay/src/database/dead-relay-tables-postgres.test.ts diff --git a/cloud/apps/relay/src/observed-relay-database.ts b/cloud/apps/relay/src/database/observed-relay-database.ts similarity index 98% rename from cloud/apps/relay/src/observed-relay-database.ts rename to cloud/apps/relay/src/database/observed-relay-database.ts index 7cae39fd062..d120a8558e7 100644 --- a/cloud/apps/relay/src/observed-relay-database.ts +++ b/cloud/apps/relay/src/database/observed-relay-database.ts @@ -4,7 +4,7 @@ import type { RelayTransactionOptions, SqlRow } from './database.js' -import { timedRelayOperation, type RelayRuntimeObserver } from './relay-observability.js' +import { timedRelayOperation, type RelayRuntimeObserver } from '../observability/relay-observability.js' export function observeRelayDatabase( database: RelayDatabase, diff --git a/cloud/apps/relay/src/postgres-checked-out-client-error.test.ts b/cloud/apps/relay/src/database/postgres-checked-out-client-error.test.ts similarity index 100% rename from cloud/apps/relay/src/postgres-checked-out-client-error.test.ts rename to cloud/apps/relay/src/database/postgres-checked-out-client-error.test.ts diff --git a/cloud/apps/relay/src/postgres-commit-with-final-write-postgres.test.ts b/cloud/apps/relay/src/database/postgres-commit-with-final-write-postgres.test.ts similarity index 100% rename from cloud/apps/relay/src/postgres-commit-with-final-write-postgres.test.ts rename to cloud/apps/relay/src/database/postgres-commit-with-final-write-postgres.test.ts diff --git a/cloud/apps/relay/src/postgres-connection-latency.test.ts b/cloud/apps/relay/src/database/postgres-connection-latency.test.ts similarity index 100% rename from cloud/apps/relay/src/postgres-connection-latency.test.ts rename to cloud/apps/relay/src/database/postgres-connection-latency.test.ts diff --git a/cloud/apps/relay/src/postgres-connection-latency.ts b/cloud/apps/relay/src/database/postgres-connection-latency.ts similarity index 100% rename from cloud/apps/relay/src/postgres-connection-latency.ts rename to cloud/apps/relay/src/database/postgres-connection-latency.ts diff --git a/cloud/apps/relay/src/postgres-idle-client-error.test.ts b/cloud/apps/relay/src/database/postgres-idle-client-error.test.ts similarity index 100% rename from cloud/apps/relay/src/postgres-idle-client-error.test.ts rename to cloud/apps/relay/src/database/postgres-idle-client-error.test.ts diff --git a/cloud/apps/relay/src/postgres-lock-wait-sample-postgres.test.ts b/cloud/apps/relay/src/database/postgres-lock-wait-sample-postgres.test.ts similarity index 97% rename from cloud/apps/relay/src/postgres-lock-wait-sample-postgres.test.ts rename to cloud/apps/relay/src/database/postgres-lock-wait-sample-postgres.test.ts index 0a6202e7b3b..6873b486738 100644 --- a/cloud/apps/relay/src/postgres-lock-wait-sample-postgres.test.ts +++ b/cloud/apps/relay/src/database/postgres-lock-wait-sample-postgres.test.ts @@ -1,5 +1,5 @@ import { afterAll, beforeAll, describe, expect, it } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' +import { RelayAssignmentStore } from '../assignment/assignment-store.js' import { openRelayDatabase, type RelayDatabase } from './database.js' import { readPostgresLockWaitSample } from './postgres-lock-wait-sample.js' diff --git a/cloud/apps/relay/src/postgres-lock-wait-sample.test.ts b/cloud/apps/relay/src/database/postgres-lock-wait-sample.test.ts similarity index 100% rename from cloud/apps/relay/src/postgres-lock-wait-sample.test.ts rename to cloud/apps/relay/src/database/postgres-lock-wait-sample.test.ts diff --git a/cloud/apps/relay/src/postgres-lock-wait-sample.ts b/cloud/apps/relay/src/database/postgres-lock-wait-sample.ts similarity index 95% rename from cloud/apps/relay/src/postgres-lock-wait-sample.ts rename to cloud/apps/relay/src/database/postgres-lock-wait-sample.ts index cb03d6a8405..2859d73c272 100644 --- a/cloud/apps/relay/src/postgres-lock-wait-sample.ts +++ b/cloud/apps/relay/src/database/postgres-lock-wait-sample.ts @@ -1,5 +1,5 @@ import type { RelayDatabase } from './database.js' -import type { DatabaseLockWaitSample } from './relay-observability.js' +import type { DatabaseLockWaitSample } from '../observability/relay-observability.js' // Use application_name (orca-relay//) to separate shared-user waiters. Follow blockers to root, keeping non-relay intermediates and bounding depth for cycles. First referenced relay table labels the wait. Shared 3-slot pool can queue/undercount samples when saturated; dedicated sampling avoids it. const LOCK_WAIT_SAMPLE_SQL = ` diff --git a/cloud/apps/relay/src/postgres-lost-reply-postgres.test.ts b/cloud/apps/relay/src/database/postgres-lost-reply-postgres.test.ts similarity index 100% rename from cloud/apps/relay/src/postgres-lost-reply-postgres.test.ts rename to cloud/apps/relay/src/database/postgres-lost-reply-postgres.test.ts diff --git a/cloud/apps/relay/src/postgres-lost-reply.test.ts b/cloud/apps/relay/src/database/postgres-lost-reply.test.ts similarity index 100% rename from cloud/apps/relay/src/postgres-lost-reply.test.ts rename to cloud/apps/relay/src/database/postgres-lost-reply.test.ts diff --git a/cloud/apps/relay/src/postgres-pool-pressure.test.ts b/cloud/apps/relay/src/database/postgres-pool-pressure.test.ts similarity index 100% rename from cloud/apps/relay/src/postgres-pool-pressure.test.ts rename to cloud/apps/relay/src/database/postgres-pool-pressure.test.ts diff --git a/cloud/apps/relay/src/postgres-pool-pressure.ts b/cloud/apps/relay/src/database/postgres-pool-pressure.ts similarity index 100% rename from cloud/apps/relay/src/postgres-pool-pressure.ts rename to cloud/apps/relay/src/database/postgres-pool-pressure.ts diff --git a/cloud/apps/relay/src/postgres-priority-lane-postgres.test.ts b/cloud/apps/relay/src/database/postgres-priority-lane-postgres.test.ts similarity index 96% rename from cloud/apps/relay/src/postgres-priority-lane-postgres.test.ts rename to cloud/apps/relay/src/database/postgres-priority-lane-postgres.test.ts index fe61d1b7539..19c0e3b4247 100644 --- a/cloud/apps/relay/src/postgres-priority-lane-postgres.test.ts +++ b/cloud/apps/relay/src/database/postgres-priority-lane-postgres.test.ts @@ -1,7 +1,7 @@ import { afterAll, describe, expect, it, vi } from 'vitest' import type { PostgresDatabase } from './database.js' import { isPostgresPoolConnectTimeout } from './postgres-pool-pressure.js' -import { openDelayedPostgresDatabase } from './test-fixtures/delayed-postgres-database.js' +import { openDelayedPostgresDatabase } from '../test-fixtures/delayed-postgres-database.js' const databaseUrl = process.env.ORCA_RELAY_TEST_POSTGRES_URL const describePostgres = databaseUrl ? describe : describe.skip diff --git a/cloud/apps/relay/src/postgres-query-failure-postgres.test.ts b/cloud/apps/relay/src/database/postgres-query-failure-postgres.test.ts similarity index 100% rename from cloud/apps/relay/src/postgres-query-failure-postgres.test.ts rename to cloud/apps/relay/src/database/postgres-query-failure-postgres.test.ts diff --git a/cloud/apps/relay/src/postgres-query-failure.test.ts b/cloud/apps/relay/src/database/postgres-query-failure.test.ts similarity index 100% rename from cloud/apps/relay/src/postgres-query-failure.test.ts rename to cloud/apps/relay/src/database/postgres-query-failure.test.ts diff --git a/cloud/apps/relay/src/postgres-query-failure.ts b/cloud/apps/relay/src/database/postgres-query-failure.ts similarity index 100% rename from cloud/apps/relay/src/postgres-query-failure.ts rename to cloud/apps/relay/src/database/postgres-query-failure.ts diff --git a/cloud/apps/relay/src/postgres-schema-concurrency-postgres.test.ts b/cloud/apps/relay/src/database/postgres-schema-concurrency-postgres.test.ts similarity index 100% rename from cloud/apps/relay/src/postgres-schema-concurrency-postgres.test.ts rename to cloud/apps/relay/src/database/postgres-schema-concurrency-postgres.test.ts diff --git a/cloud/apps/relay/src/postgres-session-end-release-postgres.test.ts b/cloud/apps/relay/src/database/postgres-session-end-release-postgres.test.ts similarity index 100% rename from cloud/apps/relay/src/postgres-session-end-release-postgres.test.ts rename to cloud/apps/relay/src/database/postgres-session-end-release-postgres.test.ts diff --git a/cloud/apps/relay/src/postgres-session-end-release.test.ts b/cloud/apps/relay/src/database/postgres-session-end-release.test.ts similarity index 100% rename from cloud/apps/relay/src/postgres-session-end-release.test.ts rename to cloud/apps/relay/src/database/postgres-session-end-release.test.ts diff --git a/cloud/apps/relay/src/postgres-statement-stats-postgres.test.ts b/cloud/apps/relay/src/database/postgres-statement-stats-postgres.test.ts similarity index 100% rename from cloud/apps/relay/src/postgres-statement-stats-postgres.test.ts rename to cloud/apps/relay/src/database/postgres-statement-stats-postgres.test.ts diff --git a/cloud/apps/relay/src/postgres-statement-stats.ts b/cloud/apps/relay/src/database/postgres-statement-stats.ts similarity index 100% rename from cloud/apps/relay/src/postgres-statement-stats.ts rename to cloud/apps/relay/src/database/postgres-statement-stats.ts diff --git a/cloud/apps/relay/src/postgres-transaction-recovery.test.ts b/cloud/apps/relay/src/database/postgres-transaction-recovery.test.ts similarity index 99% rename from cloud/apps/relay/src/postgres-transaction-recovery.test.ts rename to cloud/apps/relay/src/database/postgres-transaction-recovery.test.ts index a95a8283f54..153c25af14b 100644 --- a/cloud/apps/relay/src/postgres-transaction-recovery.test.ts +++ b/cloud/apps/relay/src/database/postgres-transaction-recovery.test.ts @@ -1,5 +1,5 @@ import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest' -import { RelayAssignmentStore } from './assignment/assignment-store.js' +import { RelayAssignmentStore } from '../assignment/assignment-store.js' import { openRelayDatabase, type RelayDatabase, diff --git a/cloud/apps/relay/src/relay-database-rejection-fence.test.ts b/cloud/apps/relay/src/database/relay-database-rejection-fence.test.ts similarity index 100% rename from cloud/apps/relay/src/relay-database-rejection-fence.test.ts rename to cloud/apps/relay/src/database/relay-database-rejection-fence.test.ts diff --git a/cloud/apps/relay/src/relay-database-rejection-fence.ts b/cloud/apps/relay/src/database/relay-database-rejection-fence.ts similarity index 100% rename from cloud/apps/relay/src/relay-database-rejection-fence.ts rename to cloud/apps/relay/src/database/relay-database-rejection-fence.ts diff --git a/cloud/apps/relay/src/relay-schema-catalog-precheck-postgres.test.ts b/cloud/apps/relay/src/database/relay-schema-catalog-precheck-postgres.test.ts similarity index 97% rename from cloud/apps/relay/src/relay-schema-catalog-precheck-postgres.test.ts rename to cloud/apps/relay/src/database/relay-schema-catalog-precheck-postgres.test.ts index 45ec44faa0d..19ea8d73115 100644 --- a/cloud/apps/relay/src/relay-schema-catalog-precheck-postgres.test.ts +++ b/cloud/apps/relay/src/database/relay-schema-catalog-precheck-postgres.test.ts @@ -1,11 +1,8 @@ import pg from 'pg' import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest' -import { - applyPostgresSchema, - catalogObjectPresence, - schemaLockTarget, - takesRelationLock -} from '@orca-cloud/postgres-schema' +import { applyPostgresSchema } from '@orca-cloud/postgres-schema/apply-postgres-schema' +import { catalogObjectPresence } from '@orca-cloud/postgres-schema/catalog-object-precheck' +import { schemaLockTarget, takesRelationLock } from '@orca-cloud/postgres-schema/schema-lock-target' import { openRelayDatabase, POSTGRES_LOCK_TIMEOUT_MS, diff --git a/cloud/apps/relay/src/relay-schema-lock-targets.test.ts b/cloud/apps/relay/src/database/relay-schema-lock-targets.test.ts similarity index 93% rename from cloud/apps/relay/src/relay-schema-lock-targets.test.ts rename to cloud/apps/relay/src/database/relay-schema-lock-targets.test.ts index b1acbc646ba..411cb334d85 100644 --- a/cloud/apps/relay/src/relay-schema-lock-targets.test.ts +++ b/cloud/apps/relay/src/database/relay-schema-lock-targets.test.ts @@ -1,10 +1,5 @@ import { describe, expect, it } from 'vitest' -import { - requireSchemaLockTarget, - schemaLockTarget, - sqlWithoutComments, - takesRelationLock -} from '@orca-cloud/postgres-schema' +import { requireSchemaLockTarget, schemaLockTarget, sqlWithoutComments, takesRelationLock } from '@orca-cloud/postgres-schema/schema-lock-target' import { relayPostgresSchemaStatements } from './database.js' function lockTakingStatements(): string[] { diff --git a/cloud/apps/relay/src/sqlite-transaction-queue.test.ts b/cloud/apps/relay/src/database/sqlite-transaction-queue.test.ts similarity index 100% rename from cloud/apps/relay/src/sqlite-transaction-queue.test.ts rename to cloud/apps/relay/src/database/sqlite-transaction-queue.test.ts diff --git a/cloud/apps/relay/src/sticky-slot-statements.test.ts b/cloud/apps/relay/src/database/sticky-slot-statements.test.ts similarity index 98% rename from cloud/apps/relay/src/sticky-slot-statements.test.ts rename to cloud/apps/relay/src/database/sticky-slot-statements.test.ts index e410cd04f52..450c9a57d4c 100644 --- a/cloud/apps/relay/src/sticky-slot-statements.test.ts +++ b/cloud/apps/relay/src/database/sticky-slot-statements.test.ts @@ -4,7 +4,7 @@ import { runInStickySlot, StickySlotStatements } from './sticky-slot-statements. import { ScriptedPoolClient, scriptedPostgresDatabase -} from './test-fixtures/scripted-postgres-pool.js' +} from '../test-fixtures/scripted-postgres-pool.js' function gated() { let open!: () => void diff --git a/cloud/apps/relay/src/sticky-slot-statements.ts b/cloud/apps/relay/src/database/sticky-slot-statements.ts similarity index 100% rename from cloud/apps/relay/src/sticky-slot-statements.ts rename to cloud/apps/relay/src/database/sticky-slot-statements.ts diff --git a/cloud/apps/relay/src/director-reserve-placement-status.test.ts b/cloud/apps/relay/src/director-reserve-placement-status.test.ts index ebba540da5c..ceb06280d0e 100644 --- a/cloud/apps/relay/src/director-reserve-placement-status.test.ts +++ b/cloud/apps/relay/src/director-reserve-placement-status.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, vi } from 'vitest' import type { RelayConfig } from './config.js' -vi.mock('./admin-token-verifier.js', () => ({ +vi.mock('./authentication/admin-token-verifier.js', () => ({ createAdminTokenVerifier: () => async (token: string) => token === 'deploy-token', createReadOnlyAdminTokenVerifier: () => async () => false, createRegionalRehomeControlApplyTokenVerifier: () => async () => false, @@ -10,7 +10,7 @@ vi.mock('./admin-token-verifier.js', () => ({ createRuntimeTokenVerifier: () => async () => false })) -vi.mock('./relay-token-verifier.js', () => ({ +vi.mock('./authentication/relay-token-verifier.js', () => ({ createRelayTokenVerifier: () => async () => null, readBearer: (value: string | undefined) => value?.replace(/^Bearer /, '') ?? null })) diff --git a/cloud/apps/relay/src/fault-injection-test-entry.ts b/cloud/apps/relay/src/fault-injection-test-entry.ts index 37dea42cc30..923cef4f462 100644 --- a/cloud/apps/relay/src/fault-injection-test-entry.ts +++ b/cloud/apps/relay/src/fault-injection-test-entry.ts @@ -1,6 +1,6 @@ import { loadRelayConfig } from './config.js' -import { reconcileCellAdmissionAtStartup } from './cell-admission-startup.js' -import { openRelayDatabase, type RelayDatabase } from './database.js' +import { reconcileCellAdmissionAtStartup } from './cell/admission/cell-admission-startup.js' +import { openRelayDatabase, type RelayDatabase } from './database/database.js' import { createRelayServer } from './relay-server.js' import { readFileSync } from 'node:fs' diff --git a/cloud/apps/relay/src/host-whereabouts-app.test.ts b/cloud/apps/relay/src/host-whereabouts-app.test.ts index e5049b2827d..812671b0621 100644 --- a/cloud/apps/relay/src/host-whereabouts-app.test.ts +++ b/cloud/apps/relay/src/host-whereabouts-app.test.ts @@ -1,12 +1,13 @@ import { describe, expect, it, vi } from 'vitest' +import type * as AdminTokenVerifier from './authentication/admin-token-verifier.js' import type { HostWhereaboutsRow } from './assignment/assignment-store.js' import { RelayAssignmentStore } from './assignment/assignment-store.js' import type { RelayConfig } from './config.js' -import { openInMemoryRelayDatabase } from './database.js' -import { ShadowSeatDirectory } from './shadow-seat-directory.js' +import { openInMemoryRelayDatabase } from './database/database.js' +import { ShadowSeatDirectory } from './cell/seats/shadow-seat-directory.js' -vi.mock('./admin-token-verifier.js', async (importOriginal) => { - const actual = await importOriginal() +vi.mock('./authentication/admin-token-verifier.js', async (importOriginal) => { + const actual = await importOriginal() const identities = new Map[0]>([ ['deploy-token', 'deploy'], ['monitor-token', 'monitor'], @@ -29,7 +30,7 @@ vi.mock('./admin-token-verifier.js', async (importOriginal) => { } }) -vi.mock('./relay-token-verifier.js', () => ({ +vi.mock('./authentication/relay-token-verifier.js', () => ({ createRelayTokenVerifier: () => async () => null, readBearer: (value: string | undefined) => value?.replace(/^Bearer /, '') ?? null })) diff --git a/cloud/apps/relay/src/index.ts b/cloud/apps/relay/src/index.ts index 33cd21dff8e..85fb33550c4 100644 --- a/cloud/apps/relay/src/index.ts +++ b/cloud/apps/relay/src/index.ts @@ -3,42 +3,42 @@ import { formatAssignmentInventorySnapshot, readAssignmentInventorySnapshot } from './assignment/assignment-inventory-snapshot.js' -import { readRegionCorrectionOutcomes } from './region-correction-outcomes.js' +import { readRegionCorrectionOutcomes } from './assignment/regional-rehome/region-correction-outcomes.js' import { RelayAssignmentStore } from './assignment/assignment-store.js' import { loadRelayConfig } from './config.js' -import { startCellHeartbeat } from './cell-heartbeat-client.js' +import { startCellHeartbeat } from './cell/cell-heartbeat-client.js' import { CELL_FLAG_DEFAULTS, CELL_FLAGS_APPLIED_EVENT, type CellFlags, cellFlagObjectName, cellFlagParser -} from './cell-flags.js' -import { startControlFlagChannel } from './relay-control-flag-channel.js' -import { readCloudRunInstanceZone } from './cloud-run-instance-zone.js' -import { readSandboxTcpCounters } from './sandbox-tcp-counters.js' +} from './cell/control-flags/cell-flags.js' +import { startControlFlagChannel } from './cell/control-flags/relay-control-flag-channel.js' +import { readCloudRunInstanceZone } from './process-lifecycle/cloud-run-instance-zone.js' +import { readSandboxTcpCounters } from './observability/sandbox-tcp-counters.js' import { reconcileCellAdmissionAtStartup, roleOwnsAssignmentMaintenance -} from './cell-admission-startup.js' -import { openRelayDatabaseAtBoot } from './boot-database-open.js' +} from './cell/admission/cell-admission-startup.js' +import { openRelayDatabaseAtBoot } from './database/boot-database-open.js' import { consumeRelayCellInventoryHold, consumeRelayDatabasePoolPressure, readRelayDatabasePoolPressure -} from './database.js' +} from './database/database.js' import { runAssignmentCleanup } from './assignment/assignment-cleanup-steps.js' -import { runRelayBackgroundOperation } from './relay-background-operation.js' -import { readPostgresLockWaitSample } from './postgres-lock-wait-sample.js' -import { jitteredSweepIntervalMs } from './relay-sweep-schedule.js' -import { observedRelayRequests } from './relay-observability.js' -import { handleRelayUnhandledRejection } from './relay-database-rejection-fence.js' -import { startRegionalRehomeWorker } from './regional-rehome-worker.js' +import { runRelayBackgroundOperation } from './process-lifecycle/relay-background-operation.js' +import { readPostgresLockWaitSample } from './database/postgres-lock-wait-sample.js' +import { jitteredSweepIntervalMs } from './process-lifecycle/relay-sweep-schedule.js' +import { observedRelayRequests } from './observability/relay-observability.js' +import { handleRelayUnhandledRejection } from './database/relay-database-rejection-fence.js' +import { startRegionalRehomeWorker } from './assignment/regional-rehome/regional-rehome-worker.js' import { createRelayServer } from './relay-server.js' import { formatRegisteredMigrationInventory, readRegisteredMigrationInventory -} from './registered-migration-inventory.js' +} from './assignment/migrations/registered-migration-inventory.js' // Both read the cell's switch file once it exists; until then, the boot values. let cellFlagsApplied: (() => CellFlags) | null = null diff --git a/cloud/apps/relay/src/phone-connection-log.ts b/cloud/apps/relay/src/observability/phone-connection-log.ts similarity index 97% rename from cloud/apps/relay/src/phone-connection-log.ts rename to cloud/apps/relay/src/observability/phone-connection-log.ts index c252c8390af..dce9078a3a3 100644 --- a/cloud/apps/relay/src/phone-connection-log.ts +++ b/cloud/apps/relay/src/observability/phone-connection-log.ts @@ -1,4 +1,4 @@ -import { AssignmentRejectionLogWindow } from './assignment/assignment-rejection-log-window.js' +import { AssignmentRejectionLogWindow } from '../assignment/assignment-rejection-log-window.js' import { relayHostLogDigest } from './relay-host-log-digest.js' // Phone-connection anomalies that repeat per dial (a stuck database, a lost ledger write, a diff --git a/cloud/apps/relay/src/post-proof-close-log.test.ts b/cloud/apps/relay/src/observability/post-proof-close-log.test.ts similarity index 100% rename from cloud/apps/relay/src/post-proof-close-log.test.ts rename to cloud/apps/relay/src/observability/post-proof-close-log.test.ts diff --git a/cloud/apps/relay/src/post-proof-close-log.ts b/cloud/apps/relay/src/observability/post-proof-close-log.ts similarity index 93% rename from cloud/apps/relay/src/post-proof-close-log.ts rename to cloud/apps/relay/src/observability/post-proof-close-log.ts index 51d074d3aea..1768d894f3e 100644 --- a/cloud/apps/relay/src/post-proof-close-log.ts +++ b/cloud/apps/relay/src/observability/post-proof-close-log.ts @@ -1,5 +1,5 @@ -import { AssignmentRejectionLogWindow } from './assignment/assignment-rejection-log-window.js' -import { printableCloseReason } from './control-close-reason-text.js' +import { AssignmentRejectionLogWindow } from '../assignment/assignment-rejection-log-window.js' +import { printableCloseReason } from '../connections/control-close-reason-text.js' import { relayHostLogDigest } from './relay-host-log-digest.js' import type { RelayRuntimeObserver } from './relay-observability.js' diff --git a/cloud/apps/relay/src/relay-error-redaction.ts b/cloud/apps/relay/src/observability/relay-error-redaction.ts similarity index 100% rename from cloud/apps/relay/src/relay-error-redaction.ts rename to cloud/apps/relay/src/observability/relay-error-redaction.ts diff --git a/cloud/apps/relay/src/relay-fix-level.ts b/cloud/apps/relay/src/observability/relay-fix-level.ts similarity index 100% rename from cloud/apps/relay/src/relay-fix-level.ts rename to cloud/apps/relay/src/observability/relay-fix-level.ts diff --git a/cloud/apps/relay/src/relay-host-log-digest.ts b/cloud/apps/relay/src/observability/relay-host-log-digest.ts similarity index 100% rename from cloud/apps/relay/src/relay-host-log-digest.ts rename to cloud/apps/relay/src/observability/relay-host-log-digest.ts diff --git a/cloud/apps/relay/src/relay-observability.test.ts b/cloud/apps/relay/src/observability/relay-observability.test.ts similarity index 100% rename from cloud/apps/relay/src/relay-observability.test.ts rename to cloud/apps/relay/src/observability/relay-observability.test.ts diff --git a/cloud/apps/relay/src/relay-observability.ts b/cloud/apps/relay/src/observability/relay-observability.ts similarity index 98% rename from cloud/apps/relay/src/relay-observability.ts rename to cloud/apps/relay/src/observability/relay-observability.ts index d93298e7542..22cb5d68ce9 100644 --- a/cloud/apps/relay/src/relay-observability.ts +++ b/cloud/apps/relay/src/observability/relay-observability.ts @@ -1,13 +1,13 @@ import { monitorEventLoopDelay, performance } from 'node:perf_hooks' -import { RELAY_REGION_METRIC_SEGMENTS, type RelayRegion } from '@orca-cloud/relay-contract' -import type { ControlRenewalOutcome } from './control-renewal-statement.js' -import type { ControlRenewalFlush } from './control-renewal-batch.js' -import type { CellInventoryHoldCounts } from './cell-inventory-hold-samples.js' -import type { PostgresPoolPressureCounts } from './postgres-pool-pressure.js' -import type { RelayReadinessGraceEvent, RelayReadinessObservation } from './relay-readiness.js' +import { RELAY_REGION_METRIC_SEGMENTS, type RelayRegion } from '@orca-cloud/relay-contract/relay-regions' +import type { ControlRenewalOutcome } from '../control-leases/control-renewal-statement.js' +import type { ControlRenewalFlush } from '../control-leases/control-renewal-batch.js' +import type { CellInventoryHoldCounts } from '../database/cell-inventory-hold-samples.js' +import type { PostgresPoolPressureCounts } from '../database/postgres-pool-pressure.js' +import type { RelayReadinessGraceEvent, RelayReadinessObservation } from '../process-lifecycle/relay-readiness.js' import { RELAY_FIX_LEVEL } from './relay-fix-level.js' import { sandboxTcpCounterDeltas, type SandboxTcpCounters } from './sandbox-tcp-counters.js' -import type { StickySlotSample } from './sticky-slot-statements.js' +import type { StickySlotSample } from '../database/sticky-slot-statements.js' export type RelayRuntimeCounts = { totalConnections: number diff --git a/cloud/apps/relay/src/sandbox-tcp-counters.test.ts b/cloud/apps/relay/src/observability/sandbox-tcp-counters.test.ts similarity index 100% rename from cloud/apps/relay/src/sandbox-tcp-counters.test.ts rename to cloud/apps/relay/src/observability/sandbox-tcp-counters.test.ts diff --git a/cloud/apps/relay/src/sandbox-tcp-counters.ts b/cloud/apps/relay/src/observability/sandbox-tcp-counters.ts similarity index 100% rename from cloud/apps/relay/src/sandbox-tcp-counters.ts rename to cloud/apps/relay/src/observability/sandbox-tcp-counters.ts diff --git a/cloud/apps/relay/src/postgres-schema-startup.ts b/cloud/apps/relay/src/postgres-schema-startup.ts deleted file mode 100644 index 3a3428eda32..00000000000 --- a/cloud/apps/relay/src/postgres-schema-startup.ts +++ /dev/null @@ -1 +0,0 @@ -export { applyPostgresSchema } from '@orca-cloud/postgres-schema' diff --git a/cloud/apps/relay/src/cloud-run-instance-zone.test.ts b/cloud/apps/relay/src/process-lifecycle/cloud-run-instance-zone.test.ts similarity index 100% rename from cloud/apps/relay/src/cloud-run-instance-zone.test.ts rename to cloud/apps/relay/src/process-lifecycle/cloud-run-instance-zone.test.ts diff --git a/cloud/apps/relay/src/cloud-run-instance-zone.ts b/cloud/apps/relay/src/process-lifecycle/cloud-run-instance-zone.ts similarity index 100% rename from cloud/apps/relay/src/cloud-run-instance-zone.ts rename to cloud/apps/relay/src/process-lifecycle/cloud-run-instance-zone.ts diff --git a/cloud/apps/relay/src/relay-background-operation.test.ts b/cloud/apps/relay/src/process-lifecycle/relay-background-operation.test.ts similarity index 100% rename from cloud/apps/relay/src/relay-background-operation.test.ts rename to cloud/apps/relay/src/process-lifecycle/relay-background-operation.test.ts diff --git a/cloud/apps/relay/src/relay-background-operation.ts b/cloud/apps/relay/src/process-lifecycle/relay-background-operation.ts similarity index 85% rename from cloud/apps/relay/src/relay-background-operation.ts rename to cloud/apps/relay/src/process-lifecycle/relay-background-operation.ts index caa917fac38..acdf180d50e 100644 --- a/cloud/apps/relay/src/relay-background-operation.ts +++ b/cloud/apps/relay/src/process-lifecycle/relay-background-operation.ts @@ -1,4 +1,4 @@ -import { describeRelayFailure } from './relay-error-redaction.js' +import { describeRelayFailure } from '../observability/relay-error-redaction.js' type Warn = (message: string) => void diff --git a/cloud/apps/relay/src/relay-local-readiness.test.ts b/cloud/apps/relay/src/process-lifecycle/relay-local-readiness.test.ts similarity index 94% rename from cloud/apps/relay/src/relay-local-readiness.test.ts rename to cloud/apps/relay/src/process-lifecycle/relay-local-readiness.test.ts index 6dd91449e01..c2172a60fa5 100644 --- a/cloud/apps/relay/src/relay-local-readiness.test.ts +++ b/cloud/apps/relay/src/process-lifecycle/relay-local-readiness.test.ts @@ -1,13 +1,13 @@ import { createServer } from 'node:http' import type { Server } from 'node:net' import { afterEach, describe, expect, it, vi } from 'vitest' -import { CELL_FLAG_DEFAULTS, type CellFlags } from './cell-flags.js' -import type { RelayConfig } from './config.js' -import type { RelayDatabase } from './database.js' -import type { AppliedControlFlags } from './relay-control-flag-channel.js' +import { CELL_FLAG_DEFAULTS, type CellFlags } from '../cell/control-flags/cell-flags.js' +import type { RelayConfig } from '../config.js' +import type { RelayDatabase } from '../database/database.js' +import type { AppliedControlFlags } from '../cell/control-flags/relay-control-flag-channel.js' import { createRelayLocalReadiness } from './relay-local-readiness.js' -import { createRelayServer } from './relay-server.js' -import { createRelayApp } from './app.js' +import { createRelayServer } from '../relay-server.js' +import { createRelayApp } from '../app.js' describe('local readiness verdict', () => { it('is not ready before the server listens', () => { diff --git a/cloud/apps/relay/src/relay-local-readiness.ts b/cloud/apps/relay/src/process-lifecycle/relay-local-readiness.ts similarity index 100% rename from cloud/apps/relay/src/relay-local-readiness.ts rename to cloud/apps/relay/src/process-lifecycle/relay-local-readiness.ts diff --git a/cloud/apps/relay/src/relay-readiness-coalescing.test.ts b/cloud/apps/relay/src/process-lifecycle/relay-readiness-coalescing.test.ts similarity index 98% rename from cloud/apps/relay/src/relay-readiness-coalescing.test.ts rename to cloud/apps/relay/src/process-lifecycle/relay-readiness-coalescing.test.ts index 2dc8ca0af22..be23a6f9267 100644 --- a/cloud/apps/relay/src/relay-readiness-coalescing.test.ts +++ b/cloud/apps/relay/src/process-lifecycle/relay-readiness-coalescing.test.ts @@ -1,5 +1,5 @@ import { expect, it, vi } from 'vitest' -import type { RelayDatabase } from './database.js' +import type { RelayDatabase } from '../database/database.js' import { createRelayReadiness } from './relay-readiness.js' function database(query: RelayDatabase['query']): RelayDatabase { diff --git a/cloud/apps/relay/src/relay-readiness.test.ts b/cloud/apps/relay/src/process-lifecycle/relay-readiness.test.ts similarity index 99% rename from cloud/apps/relay/src/relay-readiness.test.ts rename to cloud/apps/relay/src/process-lifecycle/relay-readiness.test.ts index 1b13cf799bd..c875c2f06df 100644 --- a/cloud/apps/relay/src/relay-readiness.test.ts +++ b/cloud/apps/relay/src/process-lifecycle/relay-readiness.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it, vi } from 'vitest' -import type { RelayDatabase } from './database.js' +import type { RelayDatabase } from '../database/database.js' import { createRelayReadiness, RELAY_READINESS_JWKS_GRACE_MS, diff --git a/cloud/apps/relay/src/relay-readiness.ts b/cloud/apps/relay/src/process-lifecycle/relay-readiness.ts similarity index 99% rename from cloud/apps/relay/src/relay-readiness.ts rename to cloud/apps/relay/src/process-lifecycle/relay-readiness.ts index be233668c1c..1a9b2951d13 100644 --- a/cloud/apps/relay/src/relay-readiness.ts +++ b/cloud/apps/relay/src/process-lifecycle/relay-readiness.ts @@ -1,4 +1,4 @@ -import type { RelayDatabase } from './database.js' +import type { RelayDatabase } from '../database/database.js' export type RelayReadinessFailure = | 'jwks_fetch_failed' diff --git a/cloud/apps/relay/src/relay-sweep-schedule.test.ts b/cloud/apps/relay/src/process-lifecycle/relay-sweep-schedule.test.ts similarity index 93% rename from cloud/apps/relay/src/relay-sweep-schedule.test.ts rename to cloud/apps/relay/src/process-lifecycle/relay-sweep-schedule.test.ts index 5605cc3effa..eb528e7b58f 100644 --- a/cloud/apps/relay/src/relay-sweep-schedule.test.ts +++ b/cloud/apps/relay/src/process-lifecycle/relay-sweep-schedule.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it, vi } from 'vitest' -import { startRegionalRehomeWorker } from './regional-rehome-worker.js' +import { startRegionalRehomeWorker } from '../assignment/regional-rehome/regional-rehome-worker.js' import { jitteredSweepIntervalMs } from './relay-sweep-schedule.js' describe('sweep schedule jitter', () => { diff --git a/cloud/apps/relay/src/relay-sweep-schedule.ts b/cloud/apps/relay/src/process-lifecycle/relay-sweep-schedule.ts similarity index 100% rename from cloud/apps/relay/src/relay-sweep-schedule.ts rename to cloud/apps/relay/src/process-lifecycle/relay-sweep-schedule.ts diff --git a/cloud/apps/relay/src/regional-host-drain-app.test.ts b/cloud/apps/relay/src/regional-host-drain-app.test.ts index b6209127425..a7e5cb6a920 100644 --- a/cloud/apps/relay/src/regional-host-drain-app.test.ts +++ b/cloud/apps/relay/src/regional-host-drain-app.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, vi } from 'vitest' import type { RelayConfig } from './config.js' -vi.mock('./admin-token-verifier.js', () => ({ +vi.mock('./authentication/admin-token-verifier.js', () => ({ createAdminTokenVerifier: () => async (token: string, route?: string) => token === 'deploy-token' || (token === 'monitor-token' && @@ -17,19 +17,19 @@ vi.mock('./admin-token-verifier.js', () => ({ createRuntimeTokenVerifier: () => async (token: string) => token === 'runtime-token' })) -vi.mock('./relay-token-verifier.js', () => ({ +vi.mock('./authentication/relay-token-verifier.js', () => ({ createRelayTokenVerifier: () => async () => null, readBearer: (value: string | undefined) => value?.replace(/^Bearer /, '') ?? null })) import { createRelayApp } from './app.js' -import { RelayObservability } from './relay-observability.js' -import { emptyPostgresPoolPressureCounts } from './postgres-pool-pressure.js' +import { RelayObservability } from './observability/relay-observability.js' +import { emptyPostgresPoolPressureCounts } from './database/postgres-pool-pressure.js' import { REGIONAL_REHOME_TRUST_PROBE_ATTEMPT_ID, REGIONAL_REHOME_TRUST_PROBE_HOST_ID, REGIONAL_REHOME_TRUST_PROBE_USER_ID -} from './regional-rehome-trust-probe.js' +} from './assignment/regional-rehome/regional-rehome-trust-probe.js' const cellIncarnation = '11111111-1111-4111-8111-111111111111' const request = { diff --git a/cloud/apps/relay/src/relay-ready-endpoint.test.ts b/cloud/apps/relay/src/relay-ready-endpoint.test.ts index f27a1af1119..2920f62e0b7 100644 --- a/cloud/apps/relay/src/relay-ready-endpoint.test.ts +++ b/cloud/apps/relay/src/relay-ready-endpoint.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, vi } from 'vitest' import { createRelayApp } from './app.js' import type { RelayConfig } from './config.js' -import type { RelayReadinessDependency } from './relay-readiness.js' +import type { RelayReadinessDependency } from './process-lifecycle/relay-readiness.js' function readyApp(input: { ready: boolean; degraded?: RelayReadinessDependency[] }) { // SAFETY: /ready reads only ready and readinessDegradation, so the rest of the surface, which diff --git a/cloud/apps/relay/src/relay-region-app.test.ts b/cloud/apps/relay/src/relay-region-app.test.ts index eccd916da70..becfba5b460 100644 --- a/cloud/apps/relay/src/relay-region-app.test.ts +++ b/cloud/apps/relay/src/relay-region-app.test.ts @@ -5,13 +5,13 @@ const fakes = vi.hoisted(() => ({ verifyRelayToken: vi.fn(async (token: string) => ({ sub: 'user-1', relayHostId: token })) })) -vi.mock('./relay-token-verifier.js', () => ({ +vi.mock('./authentication/relay-token-verifier.js', () => ({ createRelayTokenVerifier: () => fakes.verifyRelayToken, readBearer: (value: string | undefined) => value?.replace(/^Bearer /, '') ?? null })) import { createRelayApp } from './app.js' -import { ReservePaceError } from './reserve-assignment.js' +import { ReservePaceError } from './assignment/reserve-placement/reserve-assignment.js' describe('Relay region API', () => { it('passes a valid preference to placement and records coarse outcomes', async () => { diff --git a/cloud/apps/relay/src/relay-region-selection-app.test.ts b/cloud/apps/relay/src/relay-region-selection-app.test.ts index 88ca8c1202b..7d51fd6975b 100644 --- a/cloud/apps/relay/src/relay-region-selection-app.test.ts +++ b/cloud/apps/relay/src/relay-region-selection-app.test.ts @@ -1,12 +1,12 @@ import { describe, expect, it, vi, type Mock } from 'vitest' import type { RelayConfig } from './config.js' -import { ReservePaceError } from './reserve-assignment.js' +import { ReservePaceError } from './assignment/reserve-placement/reserve-assignment.js' const fakes = vi.hoisted(() => ({ verifyRelayToken: vi.fn(async (token: string) => ({ sub: 'user-1', relayHostId: token })) })) -vi.mock('./relay-token-verifier.js', () => ({ +vi.mock('./authentication/relay-token-verifier.js', () => ({ createRelayTokenVerifier: () => fakes.verifyRelayToken, readBearer: (value: string | undefined) => value?.replace(/^Bearer /, '') ?? null })) diff --git a/cloud/apps/relay/src/relay-server.ts b/cloud/apps/relay/src/relay-server.ts index 7965c7a9919..561f589c2f2 100644 --- a/cloud/apps/relay/src/relay-server.ts +++ b/cloud/apps/relay/src/relay-server.ts @@ -1,68 +1,61 @@ import { createAdaptorServer } from '@hono/node-server' -import { - hasAdmissionCapacity, - HostDataAuthSchema, - parseRelayHostCapabilities, - RELAY_ASSIGNMENT_LEASE_HEADER, - RELAY_ADMISSION_BUDGETS, - RELAY_HOST_CAPABILITIES_HEADER, - RELAY_CLOSE_CODE, - RELAY_DEFAULT_REGION, - RELAY_PROTOCOL_LIMITS, - RelayAuthSchema, - cellPlacementCeiling -} from '@orca-cloud/relay-contract' +import { hasAdmissionCapacity, RELAY_ADMISSION_BUDGETS, cellPlacementCeiling } from '@orca-cloud/relay-contract/admission-budgets' +import { HostDataAuthSchema, parseRelayHostCapabilities, RELAY_ASSIGNMENT_LEASE_HEADER, RELAY_HOST_CAPABILITIES_HEADER } from '@orca-cloud/relay-contract/control-messages' +import { RELAY_CLOSE_CODE } from '@orca-cloud/relay-contract/close-codes' +import { RELAY_DEFAULT_REGION } from '@orca-cloud/relay-contract/relay-regions' +import { RELAY_PROTOCOL_LIMITS } from '@orca-cloud/relay-contract/protocol-limits' +import { RelayAuthSchema } from '@orca-cloud/relay-contract/credential-messages' import type { IncomingMessage } from 'node:http' import { randomUUID } from 'node:crypto' import { performance } from 'node:perf_hooks' import { WebSocketServer } from 'ws' import type WebSocket from 'ws' import type { RawData } from 'ws' -import { CellAdmitEffectiveWriter } from './cell-admit-effective-writer.js' +import { CellAdmitEffectiveWriter } from './cell/reservations/cell-admit-effective-writer.js' import { RESERVE_DEAD_MAN_BOOT_GRACE_MS, ReserveDeadMan, reserveDeadManWindowMs -} from './cell-reserve-dead-man.js' +} from './cell/reservations/cell-reserve-dead-man.js' import { createRelayApp } from './app.js' import { classifyAssignmentLease } from './assignment/assignment-lease.js' -import { defaultIntakePerSec, type CellFlags } from './cell-flags.js' -import { CellReserveBook } from './cell-reserve-book.js' -import type { DemoteRequest, ReserveRequest } from './cell-reserve-contract.js' +import { defaultIntakePerSec, type CellFlags } from './cell/control-flags/cell-flags.js' +import { CellReserveBook } from './cell/reservations/cell-reserve-book.js' +import type { DemoteRequest, ReserveRequest } from './cell/reservations/cell-reserve-contract.js' import { AssignmentLeaseShadow } from './assignment/assignment-lease-shadow.js' import { RelayAssignmentStore } from './assignment/assignment-store.js' import type { RelayConfig } from './config.js' -import { RelayCredentialStore } from './credential-store.js' +import { RelayCredentialStore } from './credentials/credential-store.js' import { readRelayDatabasePoolOldestWaitMs, readRelayDatabasePoolPressure, type RelayDatabase -} from './database.js' -import { HostSessionRegistry } from './host-session-registry.js' -import { observeRelayDatabase } from './observed-relay-database.js' -import { RelayObservability } from './relay-observability.js' -import { combineRegionalRehomeSafety } from './regional-rehome-safety.js' -import { RelayConnectionLedger, type RelayConnectionUpgrade } from './relay-connection-ledger.js' -import { PlacementLoadBand } from './placement-load-band.js' -import type { AppliedControlFlags } from './relay-control-flag-channel.js' -import { createRelayLocalReadiness } from './relay-local-readiness.js' -import { createRelayReadiness } from './relay-readiness.js' -import { createRelayTokenVerifier, readBearer } from './relay-token-verifier.js' -import { createStaleIfErrorJWKSet } from './stale-if-error-jwks.js' -import { closeRelayWebSocket } from './relay-websocket-close.js' -import { ShadowDirectoryCompare } from './shadow-directory-compare.js' -import { type ShadowSeatPoller, startShadowSeatPoller } from './shadow-seat-directory.js' -import { CellReserveClient } from './cell-reserve-client.js' -import { googleMetadataIdentityToken, reusedIdentityToken } from './google-metadata-identity-token.js' -import { ReserveAssignment } from './reserve-assignment.js' -import { ReservePlacer } from './reserve-placement.js' -import { ReserveRehome, ReserveRehomeSwitch } from './reserve-rehome.js' +} from './database/database.js' +import { HostSessionRegistry } from './connections/host-session-registry.js' +import { observeRelayDatabase } from './database/observed-relay-database.js' +import { RelayObservability } from './observability/relay-observability.js' +import { combineRegionalRehomeSafety } from './assignment/regional-rehome/regional-rehome-safety.js' +import { RelayConnectionLedger, type RelayConnectionUpgrade } from './connections/relay-connection-ledger.js' +import { PlacementLoadBand } from './assignment/reserve-placement/placement-load-band.js' +import type { AppliedControlFlags } from './cell/control-flags/relay-control-flag-channel.js' +import { createRelayLocalReadiness } from './process-lifecycle/relay-local-readiness.js' +import { createRelayReadiness } from './process-lifecycle/relay-readiness.js' +import { createRelayTokenVerifier, readBearer } from './authentication/relay-token-verifier.js' +import { createStaleIfErrorJWKSet } from './authentication/stale-if-error-jwks.js' +import { closeRelayWebSocket } from './connections/relay-websocket-close.js' +import { ShadowDirectoryCompare } from './cell/seats/shadow-directory-compare.js' +import { type ShadowSeatPoller, startShadowSeatPoller } from './cell/seats/shadow-seat-directory.js' +import { CellReserveClient } from './cell/reservations/cell-reserve-client.js' +import { googleMetadataIdentityToken, reusedIdentityToken } from './authentication/google-metadata-identity-token.js' +import { ReserveAssignment } from './assignment/reserve-placement/reserve-assignment.js' +import { ReservePlacer } from './assignment/reserve-placement/reserve-placement.js' +import { ReserveRehome, ReserveRehomeSwitch } from './assignment/reserve-placement/reserve-rehome.js' import { reconcileReserveLedger, RESERVE_LEDGER_RECONCILE_MS, ReserveLedgerWriter -} from './reserve-ledger-writer.js' -import { ProcessQueuedByteBudget } from './splice-forwarder.js' +} from './assignment/reserve-placement/reserve-ledger-writer.js' +import { ProcessQueuedByteBudget } from './connections/splice-forwarder.js' // Malformed upgrade paths must return client errors; an uncaught listener URIError kills the process. function decodePathSegment(value: string): string | null { diff --git a/cloud/apps/relay/src/relay.blackbox.test.ts b/cloud/apps/relay/src/relay.blackbox.test.ts index d2d3e311bdf..e4c71f4dd54 100644 --- a/cloud/apps/relay/src/relay.blackbox.test.ts +++ b/cloud/apps/relay/src/relay.blackbox.test.ts @@ -8,11 +8,8 @@ import { dirname, resolve } from 'node:path' import { tmpdir } from 'node:os' import { fileURLToPath } from 'node:url' import { exportJWK, generateKeyPair, jwtVerify, SignJWT } from 'jose' -import { - ASSIGNMENT_LIMITS, - buildHostProofMacInput, - HOST_CHALLENGE_PLAINTEXT_DOMAIN -} from '@orca-cloud/relay-contract' +import { ASSIGNMENT_LIMITS } from '@orca-cloud/relay-contract/assignment-invariants' +import { buildHostProofMacInput, HOST_CHALLENGE_PLAINTEXT_DOMAIN } from '@orca-cloud/relay-contract/host-proof-transcript' import nacl from 'tweetnacl' import { afterAll, beforeAll, describe, expect, it } from 'vitest' import WebSocket from 'ws' @@ -22,8 +19,8 @@ import { RelayAssignmentStore } from './assignment/assignment-store.js' import { encodeMembership, type CellAdmissionMembership -} from './cell-admission-selector.js' -import { openRelayDatabase } from './database.js' +} from './cell/admission/cell-admission-selector.js' +import { openRelayDatabase } from './database/database.js' const appDirectory = resolve(dirname(fileURLToPath(import.meta.url)), '..') const assignmentKey = 'test-assignment-key-with-at-least-32-bytes' diff --git a/cloud/apps/relay/src/test-fixtures/delayed-postgres-database.ts b/cloud/apps/relay/src/test-fixtures/delayed-postgres-database.ts index 15345be7ba0..c8d7e74942d 100644 --- a/cloud/apps/relay/src/test-fixtures/delayed-postgres-database.ts +++ b/cloud/apps/relay/src/test-fixtures/delayed-postgres-database.ts @@ -4,7 +4,7 @@ import { POSTGRES_LOCK_TIMEOUT_MS, POSTGRES_STATEMENT_TIMEOUT_MS, PostgresDatabase -} from '../database.js' +} from '../database/database.js' export type StatementDelay = { enabled: boolean diff --git a/cloud/apps/relay/src/test-fixtures/host-control-proof.ts b/cloud/apps/relay/src/test-fixtures/host-control-proof.ts index 17fea12c498..e28389e5e68 100644 --- a/cloud/apps/relay/src/test-fixtures/host-control-proof.ts +++ b/cloud/apps/relay/src/test-fixtures/host-control-proof.ts @@ -1,20 +1,17 @@ import { createHash, createHmac } from 'node:crypto' import { EventEmitter } from 'node:events' -import { - buildHostProofMacInput, - HostChallengeSchema, - HOST_CHALLENGE_PLAINTEXT_DOMAIN -} from '@orca-cloud/relay-contract' +import { buildHostProofMacInput, HOST_CHALLENGE_PLAINTEXT_DOMAIN } from '@orca-cloud/relay-contract/host-proof-transcript' +import { HostChallengeSchema } from '@orca-cloud/relay-contract/control-messages' import nacl from 'tweetnacl' import { expect, vi, type Mock, type MockInstance } from 'vitest' import type WebSocket from 'ws' import { RelayAssignmentStore } from '../assignment/assignment-store.js' import { loadRelayConfig } from '../config.js' -import { RelayCredentialStore } from '../credential-store.js' -import type { RelayDatabase } from '../database.js' -import { HostSessionRegistry } from '../host-session-registry.js' -import type { RelayTokenClaims } from '../relay-token-verifier.js' -import { ProcessQueuedByteBudget } from '../splice-forwarder.js' +import { RelayCredentialStore } from '../credentials/credential-store.js' +import type { RelayDatabase } from '../database/database.js' +import { HostSessionRegistry } from '../connections/host-session-registry.js' +import type { RelayTokenClaims } from '../authentication/relay-token-verifier.js' +import { ProcessQueuedByteBudget } from '../connections/splice-forwarder.js' // Drive real hello/proof against stubbed database and fake sockets. diff --git a/cloud/apps/relay/src/test-fixtures/reserve-mode-cell.ts b/cloud/apps/relay/src/test-fixtures/reserve-mode-cell.ts index a942e7050da..ab84c73cb52 100644 --- a/cloud/apps/relay/src/test-fixtures/reserve-mode-cell.ts +++ b/cloud/apps/relay/src/test-fixtures/reserve-mode-cell.ts @@ -1,15 +1,15 @@ import { createHash, createHmac } from 'node:crypto' import { createServer, type Server } from 'node:http' import { createServer as createNetServer } from 'node:net' -import { buildHostProofMacInput, HOST_CHALLENGE_PLAINTEXT_DOMAIN } from '@orca-cloud/relay-contract' +import { buildHostProofMacInput, HOST_CHALLENGE_PLAINTEXT_DOMAIN } from '@orca-cloud/relay-contract/host-proof-transcript' import { exportJWK, generateKeyPair, SignJWT } from 'jose' import nacl from 'tweetnacl' import WebSocket from 'ws' import type { RawData } from 'ws' -import { CELL_FLAG_DEFAULTS, type CellFlags } from '../cell-flags.js' +import { CELL_FLAG_DEFAULTS, type CellFlags } from '../cell/control-flags/cell-flags.js' import type { RelayConfig } from '../config.js' -import type { RelayDatabase } from '../database.js' -import type { AppliedControlFlags } from '../relay-control-flag-channel.js' +import type { RelayDatabase } from '../database/database.js' +import type { AppliedControlFlags } from '../cell/control-flags/relay-control-flag-channel.js' import { createRelayServer } from '../relay-server.js' // Real reserve-cell host proof for SQLite and latency-injected PostgreSQL flip-back tests (E-mix). diff --git a/cloud/apps/relay/src/test-fixtures/scripted-postgres-pool.ts b/cloud/apps/relay/src/test-fixtures/scripted-postgres-pool.ts index fcc456919bd..11c8ba522b8 100644 --- a/cloud/apps/relay/src/test-fixtures/scripted-postgres-pool.ts +++ b/cloud/apps/relay/src/test-fixtures/scripted-postgres-pool.ts @@ -1,5 +1,5 @@ import { EventEmitter } from 'node:events' -import { PostgresDatabase } from '../database.js' +import { PostgresDatabase } from '../database/database.js' export class ScriptedPoolClient extends EventEmitter { readonly statements: string[] = [] diff --git a/cloud/apps/relay/src/test-fixtures/statement-recording-database.ts b/cloud/apps/relay/src/test-fixtures/statement-recording-database.ts index d6cea027382..88417159b4f 100644 --- a/cloud/apps/relay/src/test-fixtures/statement-recording-database.ts +++ b/cloud/apps/relay/src/test-fixtures/statement-recording-database.ts @@ -3,7 +3,7 @@ import type { RelayLockOptions, RelayTransactionOptions, SqlRow -} from '../database.js' +} from '../database/database.js' // Count real round trips including BEGIN/COMMIT rather than inferring from query counts. export class StatementRecordingDatabase implements RelayDatabase { diff --git a/cloud/packages/postgres-schema/package.json b/cloud/packages/postgres-schema/package.json index de79aa9f1fb..8d76616f383 100644 --- a/cloud/packages/postgres-schema/package.json +++ b/cloud/packages/postgres-schema/package.json @@ -16,5 +16,24 @@ "@types/node": "^24.19.2", "typescript": "^7.0.2", "vitest": "^5.0.5" + }, + "exports": { + ".": { + "types": "./dist/index.d.ts", + "default": "./dist/index.js" + }, + "./apply-postgres-schema": { + "types": "./dist/apply-postgres-schema.d.ts", + "default": "./dist/apply-postgres-schema.js" + }, + "./catalog-object-precheck": { + "types": "./dist/catalog-object-precheck.d.ts", + "default": "./dist/catalog-object-precheck.js" + }, + "./schema-lock-target": { + "types": "./dist/schema-lock-target.d.ts", + "default": "./dist/schema-lock-target.js" + }, + "./*": "./*" } } diff --git a/cloud/packages/relay-contract/package.json b/cloud/packages/relay-contract/package.json index 376fd48a10c..824b4fe6450 100644 --- a/cloud/packages/relay-contract/package.json +++ b/cloud/packages/relay-contract/package.json @@ -49,6 +49,38 @@ "./relay-regions": { "types": "./dist/relay-regions.d.ts", "default": "./dist/relay-regions.js" + }, + "./director-messages": { + "types": "./dist/director-messages.d.ts", + "default": "./dist/director-messages.js" + }, + "./close-codes": { + "types": "./dist/close-codes.d.ts", + "default": "./dist/close-codes.js" + }, + "./host-proof-transcript": { + "types": "./dist/host-proof-transcript.d.ts", + "default": "./dist/host-proof-transcript.js" + }, + "./persistence-invariants": { + "types": "./dist/persistence-invariants.d.ts", + "default": "./dist/persistence-invariants.js" + }, + "./credential-messages": { + "types": "./dist/credential-messages.d.ts", + "default": "./dist/credential-messages.js" + }, + "./host-close-reason": { + "types": "./dist/host-close-reason.d.ts", + "default": "./dist/host-close-reason.js" + }, + "./control-continuity": { + "types": "./dist/control-continuity.d.ts", + "default": "./dist/control-continuity.js" + }, + "./control-messages": { + "types": "./dist/control-messages.d.ts", + "default": "./dist/control-messages.js" } } } diff --git a/config/reliability-gates.jsonc b/config/reliability-gates.jsonc index 7253ab2be25..ccbe21cbaa3 100644 --- a/config/reliability-gates.jsonc +++ b/config/reliability-gates.jsonc @@ -18403,22 +18403,22 @@ "coveredProviders": ["relay"], "coverageNotes": "Actual registry queue with controlled store latency plus local WebSocket proof and connection-capacity suites on macOS. No PostgreSQL or live remote host run. PTY, daemon, SSH process state, WSL execution and folder/git workspace behavior are unaffected.", "motivatingLinks": [ - "https://github.com/stablyai/orca/blob/main/cloud/apps/relay/src/host-session-registry.ts" + "https://github.com/stablyai/orca/blob/main/cloud/apps/relay/src/connections/host-session-registry.ts" ], "invariant": "A closed queued transport starts no durable activation; an already-started activation retains cleanup, and a live successor becomes the indexed control without concurrent same-host activation.", "oracle": "Queue a closed control before a live retry behind stalled persistence. With controlled 4s store calls, require two total activations, one release for the already-started closed control, and live readiness at 4s. Existing tests retain cleanup when closure happens during I/O.", "commands": [ - "ORCA_BACKGROUND_LAUNCH=1 pnpm --dir cloud/apps/relay exec vitest run ../../../cloud/apps/relay/src/host-session-registry.test.ts ../../../cloud/apps/relay/src/host-session-client-accept.test.ts ../../../cloud/apps/relay/src/relay-host-proof-failure.blackbox.test.ts ../../../cloud/apps/relay/src/relay-connection-hard-cap.blackbox.test.ts --silent=false" + "ORCA_BACKGROUND_LAUNCH=1 pnpm --dir cloud/apps/relay exec vitest run ../../../cloud/apps/relay/src/connections/host-session-registry.test.ts ../../../cloud/apps/relay/src/connections/host-session-client-accept.test.ts ../../../cloud/apps/relay/src/connections/relay-host-proof-failure.blackbox.test.ts ../../../cloud/apps/relay/src/connections/relay-connection-hard-cap.blackbox.test.ts --silent=false" ], "testFiles": [ - "cloud/apps/relay/src/host-session-registry.test.ts", - "cloud/apps/relay/src/host-session-client-accept.test.ts", - "cloud/apps/relay/src/relay-host-proof-failure.blackbox.test.ts", - "cloud/apps/relay/src/relay-connection-hard-cap.blackbox.test.ts" + "cloud/apps/relay/src/connections/host-session-registry.test.ts", + "cloud/apps/relay/src/connections/host-session-client-accept.test.ts", + "cloud/apps/relay/src/connections/relay-host-proof-failure.blackbox.test.ts", + "cloud/apps/relay/src/connections/relay-connection-hard-cap.blackbox.test.ts" ], "assertionRefs": [ { - "file": "cloud/apps/relay/src/host-session-registry.test.ts", + "file": "cloud/apps/relay/src/connections/host-session-registry.test.ts", "assertions": [ "skips a closed queued control so its live retry avoids abandoned database work", "does not publish a control that closes during activation", @@ -18433,6 +18433,7 @@ "runner": "local", "platform": "macos", "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm --dir cloud/apps/relay exec vitest run ../../../cloud/apps/relay/src/host-session-registry.test.ts ../../../cloud/apps/relay/src/host-session-client-accept.test.ts ../../../cloud/apps/relay/src/relay-host-proof-failure.blackbox.test.ts ../../../cloud/apps/relay/src/relay-connection-hard-cap.blackbox.test.ts --silent=false", + "currentCommand": "ORCA_BACKGROUND_LAUNCH=1 pnpm --dir cloud/apps/relay exec vitest run ../../../cloud/apps/relay/src/connections/host-session-registry.test.ts ../../../cloud/apps/relay/src/connections/host-session-client-accept.test.ts ../../../cloud/apps/relay/src/connections/relay-host-proof-failure.blackbox.test.ts ../../../cloud/apps/relay/src/connections/relay-connection-hard-cap.blackbox.test.ts --silent=false", "result": "passed", "durationSeconds": 0.407, "summary": "88 tests across four files passed; relay typecheck passed separately." @@ -18480,15 +18481,15 @@ "invariant": "A single-cell capacity check reads only that cell while retaining snapshot freshness, incarnation, outstanding reservation and missing-limit policy; new placement retains the full fleet inventory.", "oracle": "With 32 capped cells, an existing active host stays on its pinned cell and reads one headroom row; new placement reads all 32. Missing, expired or prior-incarnation snapshots, capacity exhaustion and outstanding debt still refuse the active pinned host; an uncapped cell remains admissible.", "commands": [ - "ORCA_BACKGROUND_LAUNCH=1 pnpm --dir cloud/apps/relay exec vitest run ../../../cloud/apps/relay/src/assignment/assignment-headroom-scope.test.ts ../../../cloud/apps/relay/src/assignment/assignment-connection-headroom.test.ts ../../../cloud/apps/relay/src/assignment/assignment-store.test.ts ../../../cloud/apps/relay/src/cell-inventory-lock-contention.test.ts ../../../cloud/apps/relay/src/assignment/assignment-isolated-cell-replacement.test.ts ../../../cloud/apps/relay/src/regional-rehome-target-selection.test.ts --silent=false" + "ORCA_BACKGROUND_LAUNCH=1 pnpm --dir cloud/apps/relay exec vitest run ../../../cloud/apps/relay/src/assignment/assignment-headroom-scope.test.ts ../../../cloud/apps/relay/src/assignment/assignment-connection-headroom.test.ts ../../../cloud/apps/relay/src/assignment/assignment-store.test.ts ../../../cloud/apps/relay/src/cell/admission/cell-inventory-lock-contention.test.ts ../../../cloud/apps/relay/src/assignment/assignment-isolated-cell-replacement.test.ts ../../../cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-target-selection.test.ts --silent=false" ], "testFiles": [ "cloud/apps/relay/src/assignment/assignment-headroom-scope.test.ts", "cloud/apps/relay/src/assignment/assignment-connection-headroom.test.ts", "cloud/apps/relay/src/assignment/assignment-store.test.ts", - "cloud/apps/relay/src/cell-inventory-lock-contention.test.ts", + "cloud/apps/relay/src/cell/admission/cell-inventory-lock-contention.test.ts", "cloud/apps/relay/src/assignment/assignment-isolated-cell-replacement.test.ts", - "cloud/apps/relay/src/regional-rehome-target-selection.test.ts" + "cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-target-selection.test.ts" ], "assertionRefs": [ { @@ -18508,7 +18509,7 @@ "runner": "local", "platform": "linux", "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm --dir cloud/apps/relay test src/assignment/assignment-headroom-scope.test.ts src/assignment/assignment-connection-headroom.test.ts src/assignment/assignment-store.test.ts src/cell-inventory-lock-contention.test.ts src/assignment/assignment-isolated-cell-replacement.test.ts src/regional-rehome-target-selection.test.ts --silent=false --maxWorkers=2", - "currentCommand": "ORCA_BACKGROUND_LAUNCH=1 pnpm --dir cloud/apps/relay exec vitest run ../../../cloud/apps/relay/src/assignment/assignment-headroom-scope.test.ts ../../../cloud/apps/relay/src/assignment/assignment-connection-headroom.test.ts ../../../cloud/apps/relay/src/assignment/assignment-store.test.ts ../../../cloud/apps/relay/src/cell-inventory-lock-contention.test.ts ../../../cloud/apps/relay/src/assignment/assignment-isolated-cell-replacement.test.ts ../../../cloud/apps/relay/src/regional-rehome-target-selection.test.ts --silent=false", + "currentCommand": "ORCA_BACKGROUND_LAUNCH=1 pnpm --dir cloud/apps/relay exec vitest run ../../../cloud/apps/relay/src/assignment/assignment-headroom-scope.test.ts ../../../cloud/apps/relay/src/assignment/assignment-connection-headroom.test.ts ../../../cloud/apps/relay/src/assignment/assignment-store.test.ts ../../../cloud/apps/relay/src/cell/admission/cell-inventory-lock-contention.test.ts ../../../cloud/apps/relay/src/assignment/assignment-isolated-cell-replacement.test.ts ../../../cloud/apps/relay/src/assignment/regional-rehome/regional-rehome-target-selection.test.ts --silent=false", "result": "passed", "durationSeconds": 2.22, "summary": "164 tests passed across the six remaining headroom fixture suites on Linux through the relay package runner, including its schema/contract build hooks. This executes the current selector with two workers. It does not establish native PostgreSQL contention or transaction recovery coverage." diff --git a/tests/e2e/relay-region-correction.unit.test.ts b/tests/e2e/relay-region-correction.unit.test.ts index d37b03e31f4..6f597b4e7a5 100644 --- a/tests/e2e/relay-region-correction.unit.test.ts +++ b/tests/e2e/relay-region-correction.unit.test.ts @@ -7,18 +7,18 @@ import type { IdleRegionalRehomeRequest } from '../../cloud/packages/relay-contr import { openInMemoryRelayDatabase, readRelayDatabasePoolPressure -} from '../../cloud/apps/relay/src/database' +} from '../../cloud/apps/relay/src/database/database' import { createRelayServer } from '../../cloud/apps/relay/src/relay-server' -import { IDLE_REHOME_MIN_CONTROL_AGE_MS } from '../../cloud/apps/relay/src/host-session-registry' -import { CONTROL_RENEWAL_BATCH_INTERVAL_MS } from '../../cloud/apps/relay/src/control-renewal-batch' +import { IDLE_REHOME_MIN_CONTROL_AGE_MS } from '../../cloud/apps/relay/src/connections/host-session-registry' +import { CONTROL_RENEWAL_BATCH_INTERVAL_MS } from '../../cloud/apps/relay/src/control-leases/control-renewal-batch' import { RELAY_PROTOCOL_LIMITS } from '../../cloud/packages/relay-contract/src/protocol-limits' -import type * as AdminTokenVerifier from '../../cloud/apps/relay/src/admin-token-verifier' +import type * as AdminTokenVerifier from '../../cloud/apps/relay/src/authentication/admin-token-verifier' import { RelayOriginPool } from '../../src/main/runtime/mobile-cloud-relay/relay-origin-pool' import { RELAY_HOST_CAPABILITY_HEADERS } from '../../src/main/runtime/mobile-cloud-relay/relay-control-protocol' import type { MobileSocketTransport } from '../../src/main/runtime/rpc/mobile-socket-wiring' import { createRelayExecutionProcess } from './helpers/relay-execution-process' -vi.mock('../../cloud/apps/relay/src/relay-token-verifier', () => ({ +vi.mock('../../cloud/apps/relay/src/authentication/relay-token-verifier', () => ({ createRelayTokenVerifier: () => async (hostId: string) => ({ sub: 'transport-test-user', prof: 'profile-1', @@ -30,10 +30,14 @@ vi.mock('../../cloud/apps/relay/src/relay-token-verifier', () => ({ readBearer: (value: string | undefined) => value?.replace(/^Bearer /, '') ?? null })) -vi.mock('../../cloud/apps/relay/src/admin-token-verifier', async (importOriginal) => ({ - ...(await importOriginal()), - createRegionalRehomeTokenVerifier: () => async (token: string) => token === 'test-director-token' -})) +vi.mock( + '../../cloud/apps/relay/src/authentication/admin-token-verifier', + async (importOriginal) => ({ + ...(await importOriginal()), + createRegionalRehomeTokenVerifier: () => async (token: string) => + token === 'test-director-token' + }) +) const cleanups: (() => Promise)[] = [] afterEach(async () => {