diff --git a/.env.example b/.env.example index fb8123bc7..e0073b4fb 100644 --- a/.env.example +++ b/.env.example @@ -251,8 +251,7 @@ GITHUB_APP_SLUG=openship-io # Set these in the deployed API environment. Both Compose stacks load this # root .env; they do NOT load apps/api/.env.saas (used by dev:saas). # Use the production account's credentials for the production SaaS. -# Optional complete API mount override. Unset uses the Oblien SDK default. -# OBLIEN_API_URL=https://your-proxy.example/api/v1 +# OBLIEN_API_URL=https://api.oblien.com # OBLIEN_CLIENT_ID= # OBLIEN_CLIENT_SECRET= # Optional public base-image pack for NEW managed Cloud spaces only. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c3f05b42..eaa8f7546 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -150,7 +150,6 @@ jobs: command: >- RUN_DOCKER_E2E=1 bun run --cwd apps/api test:e2e test/e2e/platform-import-data.e2e.test.ts - test/e2e/platform-import-project.e2e.test.ts # Separate independent daemons keep real-Docker coverage within the job # budget. Tests remain serial inside each daemon to preserve isolation. - suite: Compose cutover and rollback diff --git a/.github/workflows/release-gate.yml b/.github/workflows/release-gate.yml index 0a225dfb5..fee238c02 100644 --- a/.github/workflows/release-gate.yml +++ b/.github/workflows/release-gate.yml @@ -226,24 +226,18 @@ jobs: # https://github.com/actions/runner-images/issues/15005 runs-on: ${{ matrix.scope == 'fast' && 'ubuntu-22.04' || 'ubuntu-latest' }} # Files remain serial within each disposable daemon. Split the growing - # ordinary suite across four hosts so it fits the gate without relaxing tests. + # ordinary suite across two hosts so it fits the gate without relaxing tests. timeout-minutes: ${{ matrix.scope == 'fast' && 45 || 30 }} strategy: fail-fast: false matrix: include: - scope: fast - label: fast 1/4 - shard: 1/4 + label: fast 1/2 + shard: 1/2 - scope: fast - label: fast 2/4 - shard: 2/4 - - scope: fast - label: fast 3/4 - shard: 3/4 - - scope: fast - label: fast 4/4 - shard: 4/4 + label: fast 2/2 + shard: 2/2 - scope: heavy label: heavy shard: "" diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d57b1d29..850b8fe80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,37 +4,6 @@ All notable changes to OpenShip. Versions follow [semver](https://semver.org); the in-app updater surfaces critical advisories from `release-advisories.json`. Runtime security notices use the signed feed published from `security-advisories.json`. -## Unreleased - -### Authorization - -- Require administrative authority for admin operations across HTTP, SDK, native and - MCP access. Ordinary organization membership no longer grants host command execution; - token grants remain bounded by the user's current built-in role (#1783). - -### Cloud billing - -- Open checkout only when its payment URL is ready, with a visible fallback button. - Recover unfinished Cloud purchases when reopening setup instead of creating duplicate - unpaid spaces. Show pending-plan warnings in the Plans & billing sidebar entry. - -### Backups - -- Back up verified existing empty Docker volumes and bind directories without blocking - populated sibling sources. Reject missing sources before capture and preserve failures - for unavailable backing storage (#1767). - -### CLI - -- Run the container-to-host connectivity probe with Node.js, matching the API image, - so `openship up` and `openship doctor` can diagnose the host channel without Bun. - -### Instance relocation - -- Fence event-stream admission while moving the controller so a late subscriber cannot - keep the source draining indefinitely. Restore stream access when the controller resumes, - and link server preparation to its build view while deployment reads remain available. - ## 0.9.12 **Critical update** for build-secret protection, database upgrade repairs and @@ -87,8 +56,6 @@ website. ### Domains -- Configure static HTML, JSON or text responses on a domain through its normal - route editor, including maintenance and verification responses without an app container. - Avoid rewriting unchanged edge route files and repeating remote reads during a registration. Preserve exact file contents and permissions while retaining route validation, reloads, certificate activation and transactional rollback. @@ -104,12 +71,6 @@ website. destination review, progress reporting and cancellation. - Keep migration environment fields visible while entering missing secrets, with a plain section heading instead of a nested disclosure that collapses during editing. -- Preserve source project boundaries during platform imports: one project contains - its native services, private DNS, encrypted service environments and separate volumes. - Keep service environment values scoped correctly during source builds too. -- Carry imported custom domains and aliases through the existing migration routing - flow, pending normal verification. Show DNS cutover guidance and replacement - notices for Railway and Vercel URLs in review and saved migration progress. - Restore portable instance exports with their server credentials and workspace ownership. Normalize restored data for the destination schema and keep the instance import and server selection views consistent. @@ -143,8 +104,6 @@ website. ### Dashboard, billing and website -- Keep the shared destination dropdown available with one server or Cloud plan, - with Add server in its menu across deployment and migration flows. - Refresh deployment state after navigation and browser resume. Unify project settings and shared environment controls with the existing service views. - Keep plan overview, usage and payments together under Plans & billing, align diff --git a/SECURITY.md b/SECURITY.md index 29b19ad67..87c2474ab 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -57,12 +57,6 @@ violation. ## Scope -Organization owners and administrators can perform host administration. Ordinary -members retain read/write access but cannot perform operations requiring `admin`, -including server shell execution. Restricted users require explicit resource grants; -scoped tokens also respect their user's current built-in role. Host commands execute -as the server's configured account, so delegate server administration accordingly. - In scope — all Openship components: - Managed Openship Cloud diff --git a/apps/api/.env.saas.example b/apps/api/.env.saas.example index 0c1556ce6..a4f391f91 100644 --- a/apps/api/.env.saas.example +++ b/apps/api/.env.saas.example @@ -31,8 +31,7 @@ BETTER_AUTH_SECRET=change-me-in-production INTERNAL_TOKEN=change-me-32-byte-random-hex # Required for cloud deployments. -# Leave unset to use the installed SDK's default API version. -# OBLIEN_API_URL=https://your-proxy.example/api/v1 +OBLIEN_API_URL=https://api.oblien.com OBLIEN_CLIENT_ID= OBLIEN_CLIENT_SECRET= # Optional: enable only after this software preset is published on your provider. diff --git a/apps/api/assets/geoip/GeoLite2-Country.mmdb b/apps/api/assets/geoip/GeoLite2-Country.mmdb index 50f78498c..53584f011 100644 Binary files a/apps/api/assets/geoip/GeoLite2-Country.mmdb and b/apps/api/assets/geoip/GeoLite2-Country.mmdb differ diff --git a/apps/api/package.json b/apps/api/package.json index 80b6158d5..6c8dfc4ef 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -1,6 +1,6 @@ { "name": "@repo/api", - "version": "0.9.12", + "version": "0.9.11", "license": "Apache-2.0", "private": true, "type": "module", diff --git a/apps/api/scripts/cloud-readiness.ts b/apps/api/scripts/cloud-readiness.ts index 0a483cae5..1c2330b94 100644 --- a/apps/api/scripts/cloud-readiness.ts +++ b/apps/api/scripts/cloud-readiness.ts @@ -1,5 +1,4 @@ /** Read-only release checks. Does not create tokens, checkouts, or resources. */ -import { oblienApiBaseUrl, oblienApiUrl } from "@repo/adapters"; import { runtimeTarget } from "@repo/core"; import { assertOblienEntitlementMatchesSubscription, OblienBillingApi } from "@repo/platform/engine/lib/oblien-billing-api"; import { OBLIEN_WEBHOOK_EVENTS, oblienWebhookUrl } from "@repo/platform/engine/lib/oblien-webhook-config"; @@ -8,13 +7,13 @@ const results: Array<{ check: string; ok: boolean; skipped?: boolean; detail?: s const record = (check: string, ok: boolean, detail?: string) => results.push({ check, ok, ...(detail ? { detail } : {}) }); const clientId = process.env.OBLIEN_CLIENT_ID; const clientSecret = process.env.OBLIEN_CLIENT_SECRET; -const apiBase = oblienApiBaseUrl(process.env.OBLIEN_API_URL); +const apiBase = process.env.OBLIEN_API_URL ?? "https://api.oblien.com"; record("Cloud mode", process.env.CLOUD_MODE === "true"); record("Oblien credentials configured", Boolean(clientId && clientSecret)); record("Webhook secret configured", Boolean(process.env.OBLIEN_WEBHOOK_SECRET)); record("Subscription purchases enabled", process.env.BILLING_ENABLED === "true"); -const billing = new OblienBillingApi({ clientId, clientSecret, baseUrl: apiBase.toString() }); +const billing = new OblienBillingApi({ clientId, clientSecret, baseUrl: apiBase }); const checks = await Promise.allSettled([ (async () => { await billing.assertResellerSupport(); @@ -36,13 +35,13 @@ const checks = await Promise.allSettled([ (async () => { const callback = oblienWebhookUrl(process.env.OBLIEN_WEBHOOK_URL, runtimeTarget.api); if (!clientId || !clientSecret) throw new Error("Oblien credentials are missing"); - const response = await fetch(oblienApiUrl(apiBase, "/webhooks"), { + const response = await fetch(`${apiBase.replace(/\/+$/, "")}/webhooks`, { headers: { "X-Client-ID": clientId, "X-Client-Secret": clientSecret }, redirect: "error", signal: AbortSignal.timeout(15_000), }); if (!response.ok) throw new Error(`Webhook registry HTTP ${response.status}`); const body = await response.json() as { success: boolean; webhooks?: Array<{ url: string; active: boolean; namespace?: string | null; events: string[]; secret?: string | null }> }; - const webhook = body.success ? body.webhooks?.find((item) => item.url === callback && !item.namespace && item.active) : undefined; + const webhook = body.success && body.webhooks?.find((item) => item.url === callback && !item.namespace && item.active); const missing = OBLIEN_WEBHOOK_EVENTS.filter((event) => !webhook || !webhook.events.includes(event)); const maskedSecret = typeof webhook?.secret === "string" && /^[*•*…]+$/u.test(webhook.secret); const matchingSecret = Boolean(webhook?.secret && webhook.secret === process.env.OBLIEN_WEBHOOK_SECRET); @@ -57,7 +56,7 @@ const checks = await Promise.allSettled([ })(), (async () => { if (!clientId || !clientSecret) throw new Error("Oblien credentials are missing"); - const response = await fetch(oblienApiUrl(apiBase, "/namespaces?limit=1"), { + const response = await fetch(`${apiBase.replace(/\/+$/, "")}/namespaces?limit=1`, { headers: { "X-Client-ID": clientId, "X-Client-Secret": clientSecret }, redirect: "error", signal: AbortSignal.timeout(15_000), }); diff --git a/apps/api/src/app.ts b/apps/api/src/app.ts index 0363ab976..264549493 100644 --- a/apps/api/src/app.ts +++ b/apps/api/src/app.ts @@ -23,7 +23,6 @@ import { registerControllerLifecycle, } from "./modules/system/instance/controller-state"; import { resumeControllerSockets } from "./lib/ws"; -import { resumeControllerStreams } from "./lib/sse"; import { trackBackgroundWork } from "@repo/platform/engine/lib/background-work"; import { instanceAuthorityGuard } from "./modules/system/instance/authority-guard"; import { quiesceController } from "./modules/system/instance/quiescence"; @@ -409,7 +408,6 @@ async function startControllerBackground(): Promise { backgroundStarted = true; try { resumeControllerSockets(); - resumeControllerStreams(); // ─── Backup job runner + boot reconcile ───────────────────────────── // // One JobRunner powers all backup work — BullMQ when Redis is diff --git a/apps/api/src/lib/route-permission.ts b/apps/api/src/lib/route-permission.ts index 36deb84ae..39337096d 100644 --- a/apps/api/src/lib/route-permission.ts +++ b/apps/api/src/lib/route-permission.ts @@ -276,8 +276,6 @@ export interface McpRouteMeta { description: string; /** Override the inferred hint for actions such as destructive migration cutover. */ destructive?: boolean; - /** Whether this tool may interact with external systems; defaults to true. */ - openWorld?: boolean; } export interface PermissionSpec { @@ -476,10 +474,13 @@ export function isPublicSpec(spec: RouteSpec): spec is PublicSpec { * Be precise about what that org-wide check buys, because it is easy to misread as * a defense it is not: it is strict only for a RESTRICTED principal (a scoped * token), which needs an all-GitHub grant to pass. For a session-authenticated - * owner/admin it is satisfied by broad membership authority. Ordinary members - * cannot satisfy an admin action. Per-repo read/write authority still belongs - * to `github-access.ts` at the token funnel and mutating service helpers; an - * org-wide tag never substitutes for that repository-specific check. + * owner/admin/**member** it is satisfied by bare membership — + * `roleAllowsResourceType` (permission.ts) ignores the action level for those + * roles, so `github:admin` is no higher a bar than `github:read`. The per-repo, + * read-vs-write authority for those principals is enforced ONLY by + * `github-access.ts` at the token funnel and at the mutating service helpers. + * Reading this comment as "the route layer already gates writes" is what let + * GHSA-hp2g-hw7g-f3vm sit behind a `github:admin` tag. * Paramless GitHub routes (/home, /status, /repos) also stay on the org-wide * path: `filterToolsForPrincipal` already hides them from a scoped token via * `perm.wildcard`, and their handlers narrow results through diff --git a/apps/api/src/lib/sse.ts b/apps/api/src/lib/sse.ts index 469f5dde6..210f16549 100644 --- a/apps/api/src/lib/sse.ts +++ b/apps/api/src/lib/sse.ts @@ -41,12 +41,7 @@ import { SYSTEM } from "@repo/core"; import { trackBackgroundWork } from "@repo/platform/engine/lib/background-work"; const controllerStreams = new Set(); -let accepting = true; -export function resumeControllerStreams(): void { - accepting = true; -} export function closeControllerStreams(): void { - accepting = false; for (const stream of controllerStreams) stream.abort(); } @@ -187,16 +182,6 @@ export function streamSSE( c: Context, cb: (stream: SSEStreamingApi) => Promise, ) { - // An admitted request can finish its permission/metadata read after the HTTP - // fence closed existing streams. Do not give the drain a new live subscriber. - if (!accepting) { - c.header("Retry-After", "5"); - c.header("Cache-Control", "no-store"); - return c.json({ - code: "INSTANCE_CONTROLLER_INACTIVE", - error: "Your instance is moving. Reconnect after the handoff.", - }, 503); - } const context = currentErrorContext(); // Disable reverse-proxy response buffering. nginx/OpenResty buffer proxied // responses by default, which holds SSE events back until the buffer fills — diff --git a/apps/api/src/modules/billing/billing-capacity-catalog.test.ts b/apps/api/src/modules/billing/billing-capacity-catalog.test.ts index eea7004b3..e49d13054 100644 --- a/apps/api/src/modules/billing/billing-capacity-catalog.test.ts +++ b/apps/api/src/modules/billing/billing-capacity-catalog.test.ts @@ -9,7 +9,6 @@ import type { OblienSubscription } from "@repo/platform/engine/lib/oblien-billin import { savedOffer, savedMetadata, savedMonthlyHobby } from "../../../test/helpers/saved-cloud-offer"; import capacityFixture from "../../../test/fixtures/oblien-capacity-catalog.json"; import { oblienCapacityCatalogSchema } from "@repo/platform/engine/lib/oblien-capacity"; -import { cloudBillingContract } from "@repo/adapters"; const savedPro = (): NonNullable => ({ tierId: "reseller", status: "active", billingInterval: "monthly", periodStart: "2026-09-01T00:00:00Z", periodEnd: "2026-10-01T00:00:00Z", cancelAtPeriodEnd: false, canceledAt: null, @@ -18,7 +17,7 @@ const monthlyPro = (): NonNullable => ({ ...savedPro(), offer: subscriptionOffer("pro", "monthly"), metadata: subscriptionMetadata("pro", "org-a", "ns-a") }); describe("funded Cloud offers and isolated capacity", () => { - it.each([undefined, oblienCapacityCatalogSchema.parse(cloudBillingContract(capacityFixture))])( + it.each([undefined, oblienCapacityCatalogSchema.parse(capacityFixture)])( "publishes only subscription plans without prepaid compute offers (with or without provider capacity)", (provider) => { const catalog = presentCloudPlans("en", provider); diff --git a/apps/api/src/modules/billing/billing-checkout.test.ts b/apps/api/src/modules/billing/billing-checkout.test.ts index 58bfb2d97..9bfae4ea9 100644 --- a/apps/api/src/modules/billing/billing-checkout.test.ts +++ b/apps/api/src/modules/billing/billing-checkout.test.ts @@ -37,7 +37,7 @@ vi.mock("@repo/platform/engine/lib/cloud-workspace-host", () => ({ readCloudWorkspaceHost: async () => ({ provider: null }), })); vi.mock("@repo/platform/engine/lib/oblien-client", () => ({ - getOblienClient: () => ({ vms: { getQuota: h.quota } }), + getOblienClient: () => ({ workspaces: { getQuota: h.quota } }), getOblienBillingApi: () => ({ createCheckout: h.checkout, createPortal: h.portal, diff --git a/apps/api/src/modules/billing/billing-reconcile.test.ts b/apps/api/src/modules/billing/billing-reconcile.test.ts index 3ee761206..5d92b3621 100644 --- a/apps/api/src/modules/billing/billing-reconcile.test.ts +++ b/apps/api/src/modules/billing/billing-reconcile.test.ts @@ -116,25 +116,15 @@ describe("Oblien-managed entitlements", () => { h.balance.mockResolvedValue({ ...state.balance, billingMode: "payg" }); await expect(assertCloudCanSpend("org_1")).rejects.toMatchObject({ code: "CLOUD_BILLING_BLOCKED" }); }); - it.each(["active", "past_due"] as const)("allows billing recovery during a %s unpaid renewal without granting compute or credits", async status => { + it("allows billing recovery after an unpaid renewal without granting compute or credits", async () => { const state = unpaidMonthlyCloudBilling(); - state.subscription.status = status; h.entitlement.mockResolvedValue(state.entitlement); h.subscription.mockResolvedValue({ namespace: state.entitlement.namespace, subscription: state.subscription }); h.balance.mockResolvedValue(state.balance); const result = await syncOblienEntitlement("org_1", { syncResourceLimits: false }); - expect(result).toMatchObject({ tier: "pro", subscription: { status }, entitlement: { status: "canceled", computeCovered: false } }); + expect(result).toMatchObject({ tier: "pro", subscription: { status: "past_due" }, entitlement: { status: "canceled", computeCovered: false } }); await expect(assertNamespaceHasQuota("org_1")).resolves.toBeUndefined(); await expect(assertCloudCanSpend("org_1")).rejects.toMatchObject({ statusCode: 402, code: "CLOUD_BILLING_BLOCKED" }); - expect(h.mirror).toHaveBeenCalledWith("workspace_1", "org_1", "os-customer", { - planTierId: "pro", subscriptionStatus: "canceled", - currentPeriodStart: new Date(state.entitlement.periodStart!), - currentPeriodEnd: new Date(state.entitlement.periodEnd!), - }); - // A newer balance response alone must not turn old, uncovered capacity into - // paid compute. Both authoritative reads must confirm the funded month. - h.balance.mockResolvedValue({ ...state.balance, blocking: false, computeCovered: true }); - await expect(assertCloudCanSpend("org_1")).rejects.toMatchObject({ statusCode: 402, code: "CLOUD_BILLING_BLOCKED" }); expect(h.limits).not.toHaveBeenCalled(); expect(h.setQuota).not.toHaveBeenCalled(); expect(h.resetQuota).not.toHaveBeenCalled(); diff --git a/apps/api/src/modules/billing/oblien-billing-api.test.ts b/apps/api/src/modules/billing/oblien-billing-api.test.ts index 1723cabb3..16fd45c0e 100644 --- a/apps/api/src/modules/billing/oblien-billing-api.test.ts +++ b/apps/api/src/modules/billing/oblien-billing-api.test.ts @@ -3,7 +3,6 @@ import { afterEach, beforeEach, describe, it, expect, vi } from "vitest"; import { OblienBillingApi, oblienOfferSchema, assertOblienEntitlementMatchesSubscription } from "@repo/platform/engine/lib/oblien-billing-api"; import { BillingOperationSchemas } from "@repo/contracts"; import { Value } from "@sinclair/typebox/value"; -import { providerBillingFixture } from "../../../test/helpers/oblien-vm-billing"; import capacityCatalog from "../../../test/fixtures/oblien-capacity-catalog.json"; import { monthlyCloudBilling, unpaidMonthlyCloudBilling } from "../../../test/helpers/monthly-cloud-offer"; @@ -26,7 +25,7 @@ const subscription = { success: true, namespace: "os-one", subscription: { cancelAtPeriodEnd: true, canceledAt: "2026-09-15T00:00:00Z", } }; function setup(body: unknown, status = 200) { - const fetcher = vi.fn(async (_url: Parameters[0], _init?: RequestInit) => Response.json(providerBillingFixture(body), { status })); + const fetcher = vi.fn(async (_url: Parameters[0], _init?: RequestInit) => Response.json(body, { status })); const api = new OblienBillingApi({ clientId: "test-id", clientSecret: "test-secret", fetch: fetcher as unknown as typeof fetch }); return { api, fetcher }; } @@ -48,7 +47,7 @@ describe("Oblien billing SDK and transport contract", () => { await api.createCheckout({ namespace: "os-one", kind: "subscription", billingInterval: "yearly", offer: { ...monthlyCloudBilling().subscription.offer!, unitAmount: 12000 }, metadata, affiliateBuyer, affiliateCode: "AF-0123456789", successUrl: "https://app.openship.io", cancelUrl: "https://app.openship.io", idempotencyKey: "referral-transport" }); - expect(fetcher).toHaveBeenCalledExactlyOnceWith("https://api.oblien.com/v1/billing/checkout", expect.objectContaining({ + expect(fetcher).toHaveBeenCalledExactlyOnceWith("https://api.oblien.com/billing/checkout", expect.objectContaining({ method: "POST", redirect: "error", signal: expect.any(AbortSignal), headers: expect.objectContaining({ "X-Client-ID": "test-id", "X-Client-Secret": "test-secret" }), })); @@ -60,7 +59,7 @@ describe("Oblien billing SDK and transport contract", () => { const live = { success: true, credits_per_dollar: 100, rate_card_id: "live", rates: { cpu_per_min: 1.5, memory_per_gb_min: 0.2, disk_per_gb: 0, network_per_gb: 0.15 } }; const { api, fetcher } = setup({ ...live, compute_rate_cards: [{ chargeEnabled: false, cpu_per_min: 0.001 }] }); expect(await api.getMeteredPricing()).toEqual(live); - expect(fetcher).toHaveBeenCalledWith("https://api.oblien.com/v1/pricing/calculator", expect.objectContaining({ method: "GET", redirect: "error", headers: { Accept: "application/json" } })); + expect(fetcher).toHaveBeenCalledWith("https://api.oblien.com/pricing/calculator", expect.objectContaining({ method: "GET", redirect: "error", headers: { Accept: "application/json" } })); }); it.each([ { credits_per_dollar: 50, rate_card_id: "new", rates: { cpu_per_min: 1, memory_per_gb_min: 1, disk_per_gb: 0, network_per_gb: 0 } }, @@ -75,14 +74,14 @@ describe("Oblien billing SDK and transport contract", () => { const { api, fetcher } = setup({ success: true, namespace: "os-one", pendingCheckout, wallet: { balance: 12000 } }); expect(await api.getPendingCapacityCheckout("os-one")).toEqual({ success: true, namespace: "os-one", pendingCheckout: { ...pendingCheckout, quote: { id: "quote_pending", namespace: "os-one", paymentSource: "stripe" } } }); - expect(fetcher.mock.calls[0]![0]).toBe("https://api.oblien.com/v1/billing/capacity?namespace=os-one"); + expect(fetcher.mock.calls[0]![0]).toBe("https://api.oblien.com/billing/capacity?namespace=os-one"); await expect(api.getPendingCapacityCheckout("os-other")).rejects.toMatchObject({ code: "OBLIEN_BILLING_NAMESPACE_MISMATCH" }); }); it("cancels a capacity payment with the saved provider quote and retry identity", async () => { const { api, fetcher } = setup({ success: true, namespace: "os-one", pendingCheckout: null }); const input = { quoteId: "quote_pending", idempotencyKey: "cancel-once" }; await expect(api.cancelCapacityCheckout("os-one", input)).resolves.toMatchObject({ pendingCheckout: null }); - expect(fetcher).toHaveBeenCalledWith("https://api.oblien.com/v1/billing/capacity/change/cancel", expect.objectContaining({ + expect(fetcher).toHaveBeenCalledWith("https://api.oblien.com/billing/capacity/change/cancel", expect.objectContaining({ method: "POST", })); expect(JSON.parse(fetcher.mock.calls[0]![1]!.body as string)).toEqual({ namespace: "os-one", ...input }); @@ -102,7 +101,7 @@ describe("Oblien billing SDK and transport contract", () => { (await api.cancelCheckout("os-one", checkout.id, { idempotencyKey: "cancel-once" })).checkout, ).toEqual(checkout); expect(fetcher).toHaveBeenCalledWith( - "https://api.oblien.com/v1/billing/checkout/bco_original/cancel", + "https://api.oblien.com/billing/checkout/bco_original/cancel", expect.objectContaining({ method: "POST", body: JSON.stringify({ namespace: "os-one", idempotencyKey: "cancel-once" }), @@ -124,7 +123,7 @@ describe("Oblien billing SDK and transport contract", () => { it.each([ { quote: { id: "quote_pending", namespace: "os-other", paymentSource: "stripe" }, checkoutId: "cs_requested", url: null }, { quote: { id: "quote_pending", namespace: "os-one", paymentSource: "stripe" }, checkoutId: "cs_requested", url: "https://evil.example/pay" }, - { quote: { id: "quote_pending", namespace: "os-one", paymentSource: "stripe" }, checkoutId: "cs_requested", url: "https://api.oblien.com/v1/not-a-payment#secret" }, + { quote: { id: "quote_pending", namespace: "os-one", paymentSource: "stripe" }, checkoutId: "cs_requested", url: "https://api.oblien.com/not-a-payment#secret" }, ])("rejects foreign capacity scope and untrusted resume URLs", async pendingCheckout => { await expect(setup({ success: true, namespace: "os-one", pendingCheckout }).api.getPendingCapacityCheckout("os-one")).rejects.toThrow(); }); @@ -136,16 +135,16 @@ describe("Oblien billing SDK and transport contract", () => { }); it("scopes complimentary policy writes to the requested namespace and validates the response", async () => { const policy = { quotaLimit: 3000, overdraft: 60, suspendThreshold: 60, onOverdraftAction: "stop_workspaces" as const }; - const result = { success: true, namespace: "os-one", service: "vm_compute", ...policy }; + const result = { success: true, namespace: "os-one", service: "workspace_vm", ...policy }; const { api, fetcher } = setup(result); expect(await api.setPolicy("os-one", policy)).toEqual(result); - expect(fetcher).toHaveBeenCalledWith("https://api.oblien.com/v1/billing/policy/os-one", expect.objectContaining({ method: "PUT", body: JSON.stringify(providerBillingFixture(policy)) })); + expect(fetcher).toHaveBeenCalledWith("https://api.oblien.com/billing/policy/os-one", expect.objectContaining({ method: "PUT", body: JSON.stringify(policy) })); await expect(api.setPolicy("os-two", policy)).rejects.toMatchObject({ code: "OBLIEN_BILLING_NAMESPACE_MISMATCH" }); }); it("keeps the same provider reset key on retry and rejects an unscoped reset response", async () => { const { api, fetcher } = setup({ success: true, namespace: "os-one", applied: false }); expect(await api.resetQuota("os-one", "2026-10-25T14:00:00.000Z")).toMatchObject({ applied: false }); - expect(fetcher).toHaveBeenCalledWith("https://api.oblien.com/v1/billing/policy/os-one/reset", expect.objectContaining({ method: "POST", body: JSON.stringify({ periodEnd: "2026-10-25T14:00:00.000Z" }) })); + expect(fetcher).toHaveBeenCalledWith("https://api.oblien.com/billing/policy/os-one/reset", expect.objectContaining({ method: "POST", body: JSON.stringify({ periodEnd: "2026-10-25T14:00:00.000Z" }) })); await expect(setup({ success: true, applied: true }).api.resetQuota("os-one", "2026-10-25T14:00:00.000Z")) .rejects.toMatchObject({ code: "OBLIEN_BILLING_INVALID_RESPONSE" }); }); @@ -216,7 +215,7 @@ describe("Oblien billing SDK and transport contract", () => { expect(state.checkout).not.toHaveProperty("walletCredits"); expect(state.checkout).not.toHaveProperty("paymentId"); expect(fetcher.mock.calls[0]![0]).toBe( - "https://api.oblien.com/v1/billing/checkout/cs_requested?namespace=os-one", + "https://api.oblien.com/billing/checkout/cs_requested?namespace=os-one", ); await expect(api.getCheckout("os-other", "cs_requested")).rejects.toMatchObject({ code: "OBLIEN_BILLING_NAMESPACE_MISMATCH", @@ -252,7 +251,7 @@ describe("Oblien billing SDK and transport contract", () => { it("authenticates server requests and validates the returned customer namespace", async () => { const { api, fetcher } = setup(entitlement); expect((await api.getEntitlement("os-one")).quota.used).toBe(-50); - expect(fetcher).toHaveBeenCalledWith("https://api.oblien.com/v1/billing/entitlement?namespace=os-one", expect.objectContaining({ + expect(fetcher).toHaveBeenCalledWith("https://api.oblien.com/billing/entitlement?namespace=os-one", expect.objectContaining({ headers: expect.objectContaining({ "X-Client-ID": "test-id", "X-Client-Secret": "test-secret" }), redirect: "error", })); await expect(api.getEntitlement("os-two")).rejects.toMatchObject({ code: "OBLIEN_BILLING_NAMESPACE_MISMATCH" }); @@ -276,24 +275,22 @@ describe("Oblien billing SDK and transport contract", () => { idempotencyKey: "checkout-123", }; await api.createCheckout(input); - expect(fetcher).toHaveBeenCalledWith("https://api.oblien.com/v1/billing/checkout", expect.objectContaining({ method: "POST" })); + expect(fetcher).toHaveBeenCalledWith("https://api.oblien.com/billing/checkout", expect.objectContaining({ method: "POST" })); expect(JSON.parse(String(fetcher.mock.calls[0]![1]!.body))).toEqual({ ...input, allowPromotionCodes: true }); }); - it("keeps the hosted payment page unversioned while sending checkout requests to /v1", async () => { + it("accepts the exact Oblien promotion checkout and preserves its opaque ID", async () => { const checkoutId = "bco_24f15202-6a3d-4b27-b7c2-c3abbc401bee"; const url = `https://api.oblien.com/billing/pay#${"a".repeat(43)}`; - const { api, fetcher } = setup({ success: true, url, checkoutId }); + const { api } = setup({ success: true, url, checkoutId }); await expect(api.createCheckout({ namespace: "os-one", kind: "topup", offer, metadata, successUrl: "https://app.openship.io", cancelUrl: "https://app.openship.io", idempotencyKey: "promotion-checkout" })) .resolves.toMatchObject({ url, checkoutId }); - expect(fetcher).toHaveBeenCalledWith("https://api.oblien.com/v1/billing/checkout", expect.objectContaining({ method: "POST" })); }); it.each([ "http://api.oblien.com/billing/pay", "https://api.oblien.com.evil.example/billing/pay", - "https://api.oblien.com/billing/pay?return=https://evil.example", "https://api.oblien.com/v1/other", + "https://api.oblien.com/billing/pay?return=https://evil.example", "https://api.oblien.com/other", "https://api.oblien.com/billing/pay", "https://user@api.oblien.com/billing/pay", "https://api.oblien.com:8443/billing/pay", "https://api.oblien.com/billing/pay/", - "https://api.oblien.com/v1/billing/pay", ])("rejects an invalid promotion checkout URL: %s", async (value) => { const url = value + (value === "https://api.oblien.com/billing/pay" ? "#short" : `#${"a".repeat(43)}`); await expect(setup({ success: true, url, checkoutId: "bco_24f15202-6a3d-4b27-b7c2-c3abbc401bee" }).api.createCheckout({ @@ -556,7 +553,7 @@ describe("Oblien billing SDK and transport contract", () => { const { api, fetcher } = setup({ success: true, namespace: "os-one", url: "https://billing.stripe.com/p/session/test" }); const input = { namespace: "os-one", returnUrl: "https://app.openship.io/billing/overview" }; expect((await api.createPortal(input)).url).toBe("https://billing.stripe.com/p/session/test"); - expect(fetcher).toHaveBeenCalledWith("https://api.oblien.com/v1/billing/portal", expect.objectContaining({ method: "POST", body: JSON.stringify(input), redirect: "error", signal: expect.any(AbortSignal) })); + expect(fetcher).toHaveBeenCalledWith("https://api.oblien.com/billing/portal", expect.objectContaining({ method: "POST", body: JSON.stringify(input), redirect: "error", signal: expect.any(AbortSignal) })); await expect(api.createPortal({ ...input, namespace: "os-two" })).rejects.toMatchObject({ code: "OBLIEN_BILLING_NAMESPACE_MISMATCH" }); }); it("rejects a legacy owner portal even when its hosted URL is otherwise valid", async () => { @@ -575,7 +572,7 @@ describe("Oblien billing SDK and transport contract", () => { ] as const)("uses the SDK %s method and checks the response namespace", async (method, verb, path) => { const { api, fetcher } = setup(subscription); expect(await api[method]("os-one")).toEqual(subscription); - expect(fetcher).toHaveBeenCalledWith(`https://api.oblien.com/v1${path}`, expect.objectContaining({ + expect(fetcher).toHaveBeenCalledWith(`https://api.oblien.com${path}`, expect.objectContaining({ method: verb, ...(verb === "POST" ? { body: JSON.stringify({ namespace: "os-one" }) } : {}), })); await expect(api[method]("os-two")).rejects.toMatchObject({ code: "OBLIEN_BILLING_NAMESPACE_MISMATCH" }); @@ -615,7 +612,7 @@ describe("Oblien monthly capacity contract", () => { const catalog = await api.assertMonthlyCapacitySupport(); expect(catalog.tariff.usage).toEqual({ activeVcpuHourCents: 3, reservedGiBHourCents: 0.8, retainedGiBMonthCents: 5, monthHours: 720 }); const [url, request] = fetcher.mock.calls[0]!; - expect(String(url)).toBe("https://api.oblien.com/v1/billing/capacity/catalog"); + expect(String(url)).toBe("https://api.oblien.com/billing/capacity/catalog"); expect(request?.headers).not.toHaveProperty("X-Client-Secret"); expect(request?.headers).not.toHaveProperty("X-Client-ID"); }); @@ -659,7 +656,7 @@ describe("Oblien monthly capacity contract", () => { .toThrow(/does not match/); } }); - it.each(["active", "past_due", "unpaid", "paused", "canceled"] as const)("keeps billing readable for an expired paid month and a %s renewal", async status => { + it.each(["past_due", "unpaid", "paused", "canceled"] as const)("keeps billing readable for an expired paid month and a %s renewal", async status => { const state = unpaidMonthlyCloudBilling("org-one", "os-one"); state.subscription.status = status; const entitlement = await setup(state.entitlement).api.getEntitlement("os-one"); @@ -668,8 +665,9 @@ describe("Oblien monthly capacity contract", () => { expect(entitlement).toMatchObject({ status: "canceled", computeCovered: false, capacity: { status: "expired", computeCovered: false } }); expect(entitlement.periodEnd).not.toBe(subscription!.periodEnd); }); - it.each(["active", "past_due"] as const)("still rejects funded, overlapping, foreign or inconsistent %s renewal records", status => { + it("still rejects funded, overlapping, foreign or inconsistent unpaid renewal records", () => { for (const mutate of [ + (state: ReturnType) => { state.subscription.status = "active"; }, (state: ReturnType) => { state.subscription.status = "trialing"; }, (state: ReturnType) => { state.entitlement.status = "active"; }, (state: ReturnType) => { state.entitlement.computeCovered = state.entitlement.capacity!.computeCovered = true; }, @@ -680,12 +678,9 @@ describe("Oblien monthly capacity contract", () => { (state: ReturnType) => { state.subscription.periodStart = "2026-10-15T00:00:00Z"; }, (state: ReturnType) => { state.subscription.periodStart = null; }, (state: ReturnType) => { state.subscription.periodEnd = state.subscription.periodStart; }, - (state: ReturnType) => { state.entitlement.periodStart = state.entitlement.capacity!.periodStart = state.entitlement.periodEnd!; }, (state: ReturnType) => { state.entitlement.capacity!.periodEnd = "2026-10-31T00:00:00Z"; }, ]) { - const state = unpaidMonthlyCloudBilling(); - state.subscription.status = status; - mutate(state); + const state = unpaidMonthlyCloudBilling(); mutate(state); expect(() => assertOblienEntitlementMatchesSubscription(state.entitlement, state.subscription)).toThrow(/does not match/); } }); @@ -697,9 +692,9 @@ describe("Oblien monthly capacity contract", () => { offer: subscription.offer!, metadata: subscription.metadata!, idempotencyKey: "saved-monthly-order", successUrl: "https://app.openship.io/billing/overview", cancelUrl: "https://app.openship.io/billing/plans" }); const [url, request] = fetcher.mock.calls[0]!; - expect(String(url)).toBe("https://api.oblien.com/v1/billing/checkout"); + expect(String(url)).toBe("https://api.oblien.com/billing/checkout"); const sent = JSON.parse(String(request?.body)); - expect(sent.offer).toMatchObject({ unitAmount, credits: 0, billingMode: "monthly", capacity: { vcpus: 4, memoryMb: 16384, diskGb: 128, vms: 1 } }); + expect(sent.offer).toMatchObject({ unitAmount, credits: 0, billingMode: "monthly", capacity: { vcpus: 4, memoryMb: 16384, diskGb: 128, workspaces: 1 } }); expect(sent.offer).not.toHaveProperty("policy"); expect(sent.idempotencyKey).toBe("saved-monthly-order"); expect(sent.allowPromotionCodes).toBe(unitAmount > 0); @@ -768,18 +763,18 @@ describe("Oblien subscription changes", () => { it("delegates all four methods to the official SDK and preserves provider cents and fractional credits", async () => { const preview = setup({ success: true, namespace: "os-one", quote }); expect((await preview.api.previewPlanChange("os-one", input)).quote).toEqual(quote); - expect(preview.fetcher).toHaveBeenCalledWith("https://api.oblien.com/v1/billing/subscription/changes/preview", + expect(preview.fetcher).toHaveBeenCalledWith("https://api.oblien.com/billing/subscription/changes/preview", expect.objectContaining({ method: "POST" })); expect(JSON.parse(String(preview.fetcher.mock.calls[0]![1]!.body))).toEqual({ namespace: "os-one", ...input }); const accept = setup({ success: true, namespace: "os-one", change }, 202); expect((await accept.api.changePlan("os-one", { quoteId: quote.id, idempotencyKey: "confirm-request" })).change.status).toBe("payment_pending"); - expect(accept.fetcher).toHaveBeenLastCalledWith("https://api.oblien.com/v1/billing/subscription/changes", + expect(accept.fetcher).toHaveBeenLastCalledWith("https://api.oblien.com/billing/subscription/changes", expect.objectContaining({ method: "POST" })); expect(JSON.parse(String(accept.fetcher.mock.calls.at(-1)![1]!.body))).toEqual({ namespace: "os-one", quoteId: quote.id, idempotencyKey: "confirm-request" }); await accept.api.getPlanChange("os-one", change.id); - expect(accept.fetcher).toHaveBeenLastCalledWith("https://api.oblien.com/v1/billing/subscription/changes/change_one?namespace=os-one", expect.objectContaining({ method: "GET" })); + expect(accept.fetcher).toHaveBeenLastCalledWith("https://api.oblien.com/billing/subscription/changes/change_one?namespace=os-one", expect.objectContaining({ method: "GET" })); await accept.api.cancelPlanChange("os-one", change.id, "cancel-request"); - expect(accept.fetcher).toHaveBeenLastCalledWith("https://api.oblien.com/v1/billing/subscription/changes/change_one/cancel", + expect(accept.fetcher).toHaveBeenLastCalledWith("https://api.oblien.com/billing/subscription/changes/change_one/cancel", expect.objectContaining({ method: "POST" })); expect(JSON.parse(String(accept.fetcher.mock.calls.at(-1)![1]!.body))).toEqual({ namespace: "os-one", idempotencyKey: "cancel-request" }); }); diff --git a/apps/api/src/modules/billing/oblien-managed-transfer.test.ts b/apps/api/src/modules/billing/oblien-managed-transfer.test.ts index c43a1504f..fb2ed26a8 100644 --- a/apps/api/src/modules/billing/oblien-managed-transfer.test.ts +++ b/apps/api/src/modules/billing/oblien-managed-transfer.test.ts @@ -1,12 +1,11 @@ import { describe, expect, it } from "vitest"; import { Value } from "@sinclair/typebox/value"; import { BillingComputeSchema } from "@repo/contracts"; -import { providerBillingFixture } from "../../../test/helpers/oblien-vm-billing"; import { OblienBillingApi, assertOblienEntitlementMatchesSubscription } from "@repo/platform/engine/lib/oblien-billing-api"; import { monthlyCloudBilling } from "../../../test/helpers/monthly-cloud-offer"; import transfer from "../../../test/fixtures/oblien-managed-transfer.json"; -// Native provider transfer counters with synthetic data. +// SDK 2.10's live response shape, with synthetic counters and no customer data. const unlimited = { ...transfer, unlimited: true, includedBytes: null, includedAvailableBytes: null, availableBytes: null }; async function readTransfer(network: unknown, covered = true) { @@ -15,7 +14,7 @@ async function readTransfer(network: unknown, covered = true) { ...entitlement.capacity, computeCovered: covered, network, } }; const api = new OblienBillingApi({ clientId: "test-id", clientSecret: "test-secret", - fetch: (async () => Response.json(providerBillingFixture(payload))) as typeof fetch }); + fetch: (async () => Response.json(payload)) as typeof fetch }); const result = await api.getEntitlement("os-one"); assertOblienEntitlementMatchesSubscription(result, subscription); return result.capacity!; diff --git a/apps/api/src/modules/billing/oblien-webhook-crypto.test.ts b/apps/api/src/modules/billing/oblien-webhook-crypto.test.ts index 25c707895..d92cc82fe 100644 --- a/apps/api/src/modules/billing/oblien-webhook-crypto.test.ts +++ b/apps/api/src/modules/billing/oblien-webhook-crypto.test.ts @@ -64,7 +64,7 @@ describe("deriveOblienEventId", () => { const base: OblienEventEnvelope = { event: "credits.usage", timestamp: "2026-07-21T10:00:00Z", - data: { namespace: "os-abc", vm_id: "ws_1", period_end: "2026-08-01T00:00:00Z" }, + data: { namespace: "os-abc", workspace_id: "ws_1", period_end: "2026-08-01T00:00:00Z" }, }; it("is deterministic for the same payload", () => { diff --git a/apps/api/src/modules/billing/oblien-webhook.controller.test.ts b/apps/api/src/modules/billing/oblien-webhook.controller.test.ts index 2302b9d73..360375850 100644 --- a/apps/api/src/modules/billing/oblien-webhook.controller.test.ts +++ b/apps/api/src/modules/billing/oblien-webhook.controller.test.ts @@ -294,7 +294,7 @@ describe("oblienWebhook — dispatch", () => { describe("durable quota alert receipt", () => { it("returns 503 without a checkpoint when notification storage fails, then retries the same event", async () => { - const body = JSON.stringify({ id: "evt-critical", event: "credits.depleted", data: { namespace: "os-abc", service: "vm_compute" } }); + const body = JSON.stringify({ id: "evt-critical", event: "credits.depleted", data: { namespace: "os-abc", service: "workspace_vm" } }); h.enqueue.mockRejectedValueOnce(new Error("database unavailable")); expect(((await oblienWebhook(makeCtx(body, sign(body), "evt-critical"))) as unknown as JsonResult).status).toBe(503); expect(h.processed.size).toBe(0); @@ -305,7 +305,7 @@ describe("durable quota alert receipt", () => { expect(h.processed.size).toBe(1); }); it("leaves the event retryable when exhaustion activity cannot be recorded", async () => { - const body = JSON.stringify({ id: "evt-activity", event: "credits.depleted", data: { namespace: "os-abc", service: "vm_compute" } }); + const body = JSON.stringify({ id: "evt-activity", event: "credits.depleted", data: { namespace: "os-abc", service: "workspace_vm" } }); h.auditRecord.mockRejectedValueOnce(new Error("activity storage unavailable")); expect(((await oblienWebhook(makeCtx(body, sign(body), "evt-activity"))) as unknown as JsonResult).status).toBe(503); expect(h.processed.size).toBe(0); diff --git a/apps/api/src/modules/cloud/cloud-pages.service.ts b/apps/api/src/modules/cloud/cloud-pages.service.ts index f2b18387a..9530a4f99 100644 --- a/apps/api/src/modules/cloud/cloud-pages.service.ts +++ b/apps/api/src/modules/cloud/cloud-pages.service.ts @@ -5,7 +5,7 @@ import { authorizeCloudRelayWorkspace } from "./cloud-relay-access"; export async function createCloudPage( ctx: RequestContext, - input: { vm_id: string; path: string; name: string; slug: string; domain?: string }, + input: { workspace_id: string; path: string; name: string; slug: string; domain?: string }, ): Promise { const workspaceId = await authorizeCloudRelayWorkspace(ctx); const namespace = await ensureNamespace(ctx.organizationId, workspaceId); diff --git a/apps/api/src/modules/cloud/cloud-resource.controller.ts b/apps/api/src/modules/cloud/cloud-resource.controller.ts index 34ac7305e..db9cd5e26 100644 --- a/apps/api/src/modules/cloud/cloud-resource.controller.ts +++ b/apps/api/src/modules/cloud/cloud-resource.controller.ts @@ -10,9 +10,9 @@ import { authorizeCloudRelayWorkspace } from "./cloud-relay-access"; const id = z.string().regex(/^[a-zA-Z0-9_-]{1,128}$/); const path = z.string().min(1).max(2048); const domain = z.string().min(1).max(253); -const source = z.object({ vm_id: id, path }).strict(); +const source = z.object({ workspace_id: id, path }).strict(); const action = z.discriminatedUnion("kind", [ - z.object({ kind: z.literal("proxy"), vm: id, port: z.number().int().min(1).max(65535), + z.object({ kind: z.literal("proxy"), workspace: id, port: z.number().int().min(1).max(65535), stripPrefix: z.boolean().optional(), path: path.optional() }).strict(), z.object({ kind: z.literal("rewrite"), to: path }).strict(), z.object({ kind: z.literal("redirect"), to: path, status: z.union([z.literal(301), z.literal(302), z.literal(307), z.literal(308)]).optional() }).strict(), diff --git a/apps/api/src/modules/cloud/cloud-saas.controller.ts b/apps/api/src/modules/cloud/cloud-saas.controller.ts index 10adfda66..03810ef70 100644 --- a/apps/api/src/modules/cloud/cloud-saas.controller.ts +++ b/apps/api/src/modules/cloud/cloud-saas.controller.ts @@ -635,11 +635,11 @@ export async function checkEdgeVerification(c: Context) { // ─── Pages proxy ──────────────────────────────────────────────────────────── /** - * POST /api/cloud/pages { vm_id, path, name, slug, domain? } + * POST /api/cloud/pages { workspace_id, path, name, slug, domain? } * * Forwards to Oblien with the caller's namespace token. Oblien * enforces: - * - `vm_id` must belong to the caller's namespace (or 404) + * - `workspace_id` must belong to the caller's namespace (or 404) * - `slug` must be free on the shared zone (or 409 SLUG_TAKEN) * * Returns the raw Oblien SDK shape so the caller's infrastructure adapter @@ -648,18 +648,18 @@ export async function checkEdgeVerification(c: Context) { export async function pagesProxy(c: Context) { const ctx = getRequestContext(c); const body = await c.req.json<{ - vm_id?: string; + workspace_id?: string; path?: string; name?: string; slug?: string; domain?: string; }>(); - if (!body.vm_id || !body.path || !body.name || !body.slug) { - return c.json({ error: "vm_id, path, name and slug are required" }, 400); + if (!body.workspace_id || !body.path || !body.name || !body.slug) { + return c.json({ error: "workspace_id, path, name and slug are required" }, 400); } try { const result = await createCloudPage(ctx, { - vm_id: body.vm_id, + workspace_id: body.workspace_id, path: body.path, name: body.name, slug: body.slug, diff --git a/apps/api/src/modules/deployments/build-pipeline.prebuilt-image.test.ts b/apps/api/src/modules/deployments/build-pipeline.prebuilt-image.test.ts index f4df5dde0..4e5d91744 100644 --- a/apps/api/src/modules/deployments/build-pipeline.prebuilt-image.test.ts +++ b/apps/api/src/modules/deployments/build-pipeline.prebuilt-image.test.ts @@ -92,7 +92,7 @@ vi.mock("@repo/db", () => ({ listByProject: vi.fn(async () => []), remove: vi.fn(async () => undefined), }, - project: { findById: mocks.findProjectById, update: vi.fn(async () => undefined), getEnvMap: vi.fn(async () => ({})) }, + project: { findById: mocks.findProjectById, update: vi.fn(async () => undefined) }, }, })); diff --git a/apps/api/src/modules/deployments/cancel-is-final.test.ts b/apps/api/src/modules/deployments/cancel-is-final.test.ts index 062a62169..841363250 100644 --- a/apps/api/src/modules/deployments/cancel-is-final.test.ts +++ b/apps/api/src/modules/deployments/cancel-is-final.test.ts @@ -43,6 +43,7 @@ vi.mock("@repo/platform/engine/modules/projects/cleanup-keep-set", () => ({ // Terminal-event side channels, each of which drags in auth/github/mail wiring. vi.mock("@repo/platform/engine/lib/notification-dispatcher", () => ({ notification: { emit: mocks.notify } })); vi.mock("../../lib/audit", () => ({ audit: { recordAsync: vi.fn(), record: vi.fn() } })); +vi.mock("@repo/platform/engine/lib/favicon-detector", () => ({ detectAndStoreFavicon: vi.fn(async () => {}) })); vi.mock("@repo/platform/engine/modules/mail/webmail/webmail-install.service", () => ({ onWebmailDeployed: vi.fn(async () => {}), })); diff --git a/apps/api/src/modules/deployments/compose/build-cancel.test.ts b/apps/api/src/modules/deployments/compose/build-cancel.test.ts index fcb82ccb5..86d366a08 100644 --- a/apps/api/src/modules/deployments/compose/build-cancel.test.ts +++ b/apps/api/src/modules/deployments/compose/build-cancel.test.ts @@ -4,11 +4,9 @@ import { describe, expect, it, vi } from "vitest"; // Same stubs as build.service.test.ts: the DB row read and the SSE broadcast are // side effects this contract doesn't depend on (and importing the real @repo/db // would risk the PGlite single-instance lock). -const { listByProjectMock, getEnvMapMock } = vi.hoisted(() => ({ - listByProjectMock: vi.fn(), getEnvMapMock: vi.fn(async () => ({})), -})); +const { listByProjectMock } = vi.hoisted(() => ({ listByProjectMock: vi.fn() })); vi.mock("@repo/db", () => ({ - repos: { project: { getEnvMap: getEnvMapMock }, service: { listByProject: listByProjectMock } }, + repos: { service: { listByProject: listByProjectMock } }, })); vi.mock("@repo/platform/engine/modules/deployments/session-manager", () => ({ broadcastServiceStatus: vi.fn(), diff --git a/apps/api/src/modules/deployments/compose/build.service.test.ts b/apps/api/src/modules/deployments/compose/build.service.test.ts index 9023d7848..f8e2770d9 100644 --- a/apps/api/src/modules/deployments/compose/build.service.test.ts +++ b/apps/api/src/modules/deployments/compose/build.service.test.ts @@ -1,5 +1,4 @@ import { existsSync, readdirSync } from "node:fs"; -import { encrypt } from "@repo/platform/engine/lib/encryption"; import { readFile } from "node:fs/promises"; import { tmpdir } from "node:os"; import { isAbsolute, join } from "node:path"; @@ -13,11 +12,9 @@ import { describe, expect, it, vi } from "vitest"; // status. Both are side effects the inline-build materialization contract does not // depend on — stub them so the test exercises ONLY the materialize/COPY path. // (Importing the real @repo/db would also risk the PGlite single-instance lock.) -const { listByProjectMock, getEnvMapMock } = vi.hoisted(() => ({ - listByProjectMock: vi.fn(), getEnvMapMock: vi.fn(async () => ({})), -})); +const { listByProjectMock } = vi.hoisted(() => ({ listByProjectMock: vi.fn() })); vi.mock("@repo/db", () => ({ - repos: { project: { getEnvMap: getEnvMapMock }, service: { listByProject: listByProjectMock, startServiceDeploymentTiming: vi.fn(async () => {}) } }, + repos: { service: { listByProject: listByProjectMock, startServiceDeploymentTiming: vi.fn(async () => {}) } }, })); vi.mock("@repo/platform/engine/modules/deployments/session-manager", () => ({ broadcastServiceStatus: vi.fn(), @@ -570,19 +567,6 @@ describe("buildComposeImages — inline catalog build materialization", () => { * These pin the producer side: which rows get a narrowed context, and which must not. */ describe("buildComposeImages — declared build context", () => { - it("uses each service's encrypted saved environment for its own build", async () => { - getEnvMapMock.mockResolvedValueOnce({ API_SECRET: encrypt("api-only"), PORT: encrypt("3000") }); - getEnvMapMock.mockResolvedValueOnce({ WORKER_SECRET: encrypt("worker-only"), PORT: encrypt("8000") }); - const { captured } = await run([ - repoService({ id: "api", name: "api", build: "." }), - repoService({ id: "worker", name: "worker", build: "." }), - ], undefined, undefined, { SHARED: "shared" }); - expect(captured.map(({ config }) => config.envVars)).toEqual([ - { SHARED: "shared", API_SECRET: "api-only", PORT: "3000" }, - { SHARED: "shared", WORKER_SECRET: "worker-only", PORT: "8000" }, - ]); - }); - it("#795 carries project env into the posted root-Dockerfile setup without duplicate service env", async () => { const projectEnv = { DATABASE_URI: "postgres://db/app", diff --git a/apps/api/src/modules/deployments/route-issues-warning.test.ts b/apps/api/src/modules/deployments/route-issues-warning.test.ts index 662d10f40..ef824d981 100644 --- a/apps/api/src/modules/deployments/route-issues-warning.test.ts +++ b/apps/api/src/modules/deployments/route-issues-warning.test.ts @@ -1,11 +1,12 @@ import { describe, expect, it, vi } from "vitest"; // The function under test is pure; everything else this module reaches (DB, SSE, -// notifications) is a side effect the assertion doesn't want. +// notifications, favicon probing) is a side effect the assertion doesn't want. // `@repo/adapters` stays REAL — `isEdgeDownMessage` is the branch being pinned. vi.mock("@repo/db", () => ({ repos: {} })); vi.mock("@repo/platform/engine/lib/notification-dispatcher", () => ({ notification: {} })); vi.mock("../../lib/audit", () => ({ audit: {} })); +vi.mock("@repo/platform/engine/lib/favicon-detector", () => ({ detectAndStoreFavicon: vi.fn() })); vi.mock("@repo/platform/engine/modules/deployments/session-manager", () => ({})); vi.mock("@repo/platform/engine/modules/mail/webmail/webmail-install.service", () => ({ onWebmailDeployed: vi.fn(), diff --git a/apps/api/src/modules/domains/routing-apply.service.test.ts b/apps/api/src/modules/domains/routing-apply.service.test.ts index c63228aff..c3a3b8933 100644 --- a/apps/api/src/modules/domains/routing-apply.service.test.ts +++ b/apps/api/src/modules/domains/routing-apply.service.test.ts @@ -132,7 +132,7 @@ describe("Cloud Docker route tables", () => { } as Record )[`${container}:${port}`]; if (!published) throw new Error("service port is not published"); - return { vm: "shared-vm", port: published }; + return { workspace: "shared-vm", port: published }; }); }); it("repairs an existing single static container route without rebuilding", async () => { @@ -149,7 +149,7 @@ describe("Cloud Docker route tables", () => { }; domainRepo.listByProject.mockResolvedValue([savedDomain]); domainRepo.findByHostname.mockResolvedValue(savedDomain); - target.mockResolvedValue({ vm: "shared-vm", port: 30000 }); + target.mockResolvedValue({ workspace: "shared-vm", port: 30000 }); await applyCloudRouting({ project: { ...base, workloadType: "static", hasServer: false, port: 3000 } as never, deployment: { @@ -186,9 +186,9 @@ describe("Cloud Docker route tables", () => { ["stack-api.opsh.io", 30003, false], ]); expect(publish.mock.calls.map((call) => call[3].routes[0].action)).toEqual([ - { kind: "proxy", vm: "shared-vm", port: 30001 }, - { kind: "proxy", vm: "shared-vm", port: 30002 }, - { kind: "proxy", vm: "shared-vm", port: 30003 }, + { kind: "proxy", workspace: "shared-vm", port: 30001 }, + { kind: "proxy", workspace: "shared-vm", port: 30002 }, + { kind: "proxy", workspace: "shared-vm", port: 30003 }, ]); }); it("resolves project-level domains to their service's exact published port", async () => { @@ -209,7 +209,7 @@ describe("Cloud Docker route tables", () => { expect.objectContaining({ routes: [ expect.objectContaining({ - action: { kind: "proxy", vm: "shared-vm", port: 30002 }, + action: { kind: "proxy", workspace: "shared-vm", port: 30002 }, }), ], }), @@ -235,15 +235,15 @@ describe("Cloud Docker route tables", () => { expect(writes[0]![3].routes).toEqual([ { match: { path: "/api/status", type: "exact" }, - action: { kind: "proxy", vm: "shared-vm", port: 30001 }, + action: { kind: "proxy", workspace: "shared-vm", port: 30001 }, }, { match: { path: "/api/", type: "prefix" }, - action: { kind: "proxy", vm: "shared-vm", port: 30003 }, + action: { kind: "proxy", workspace: "shared-vm", port: 30003 }, }, { match: { path: "/", type: "prefix" }, - action: { kind: "proxy", vm: "shared-vm", port: 30001 }, + action: { kind: "proxy", workspace: "shared-vm", port: 30001 }, }, ]); }); @@ -259,7 +259,7 @@ describe("Cloud Docker route tables", () => { }], }); expect(publish).toHaveBeenCalledWith("api.onvo.me", undefined, true, { - routes: [{ match: { path: "/v3", type: "prefix" }, action: { kind: "proxy", vm: "shared-vm", port: 30003 } }], + routes: [{ match: { path: "/v3", type: "prefix" }, action: { kind: "proxy", workspace: "shared-vm", port: 30003 } }], }); }); it("keeps the old composite table if any path target is missing, while updating other hosts", async () => { @@ -296,11 +296,11 @@ describe("Cloud Docker route tables", () => { expect(rules).toEqual([ { match: { path: "/api/", type: "prefix" }, - action: { kind: "proxy", vm: "shared-vm", port: 30003 }, + action: { kind: "proxy", workspace: "shared-vm", port: 30003 }, }, { match: { path: "/", type: "prefix" }, - action: { kind: "proxy", vm: "shared-vm", port: 30001 }, + action: { kind: "proxy", workspace: "shared-vm", port: 30001 }, }, ]); }); diff --git a/apps/api/src/modules/images/images.service.ts b/apps/api/src/modules/images/images.service.ts index 6b24ab6c9..b62749d95 100644 --- a/apps/api/src/modules/images/images.service.ts +++ b/apps/api/src/modules/images/images.service.ts @@ -91,7 +91,7 @@ export async function listImages( if (hit) return hit; const client = await getClientForOrg(organizationId); - const response = await client.vms.images.list(params); + const response = await client.workspaces.images.list(params); const images = normalizeImages(response); await store.set(key, images, CACHE_TTL_S); return images; diff --git a/apps/api/src/modules/mcp/mcp-tools.ts b/apps/api/src/modules/mcp/mcp-tools.ts index 12cf298e5..737e8e1fe 100644 --- a/apps/api/src/modules/mcp/mcp-tools.ts +++ b/apps/api/src/modules/mcp/mcp-tools.ts @@ -42,7 +42,7 @@ export interface McpToolDef { name: string; description: string; inputSchema: Record; - annotations: { readOnlyHint: boolean; destructiveHint: boolean; openWorldHint: boolean }; + annotations: { readOnlyHint: boolean; destructiveHint: boolean }; // Dispatch metadata (not sent to the client): method: string; path: string; // full path with :params, e.g. /api/projects/:id @@ -76,8 +76,6 @@ export interface McpPrincipal { /** Resolved with the same persisted instance-authority policy as HTTP calls. */ instanceAdmin?: boolean; role: "owner" | "admin" | "member" | "restricted"; - /** For scoped tokens, the current membership in their bound organization. */ - membershipRole?: "owner" | "admin" | "member" | "restricted"; readOnly: boolean; /** Resource types the token holds grants on — only consulted when role === "restricted". */ grantedRootTypes: ReadonlySet; @@ -186,12 +184,9 @@ function inputSchema( function annotationsFor(route: RegisteredRoute): { readOnlyHint: boolean; destructiveHint: boolean; - openWorldHint: boolean; } { const spec = route.spec; - if (isPublicSpec(spec)) { - return { readOnlyHint: true, destructiveHint: false, openWorldHint: true }; - } + if (isPublicSpec(spec)) return { readOnlyHint: true, destructiveHint: false }; const parsed = parsePermissionTag(spec.tag); const readOnlyHint = route.method === "GET" || spec.readOnly === true; const destructiveHint = @@ -200,7 +195,7 @@ function annotationsFor(route: RegisteredRoute): { (route.method === "DELETE" || parsed.action === "admin" || /delete|teardown|destroy|remove|wipe|revoke/i.test(route.path))); - return { readOnlyHint, destructiveHint, openWorldHint: spec.mcp?.openWorld ?? true }; + return { readOnlyHint, destructiveHint }; } let cached: McpToolDef[] | null = null; @@ -355,10 +350,6 @@ export function filterToolsForPrincipal( principal: McpPrincipal, ): McpToolDef[] { return tools.filter((t) => { - const action = assertedAction(t.perm.action); - const role = principal.membershipRole ?? principal.role; - if (role !== "restricted" && - !roleAllowsResourceType(role, t.perm.leaf as CheckedResourceType, action)) return false; // Read-only tokens can only call GET — the runtime gate rejects mutations by // HTTP method, so mirror that exactly rather than guessing from the tag. if (principal.readOnly && t.method !== "GET") return false; @@ -382,7 +373,9 @@ export function filterToolsForPrincipal( if (principal.role === "restricted" && !caps?.has(needed)) return false; } - if (principal.role !== "restricted") return true; + if (principal.role !== "restricted") { + return roleAllowsResourceType(principal.role, t.perm.leaf as CheckedResourceType); + } // "Own projects" scope: the create-capable project wildcard grant reaches the // dedicated create routes (POST /projects, POST /apps) and the project list // (which the caller filters to its self-created projects). Checked before the @@ -408,11 +401,11 @@ export function filterToolsForPrincipal( // A per-id grant still fails here, correctly: `wildcardGrants` holds only // resourceId "*" rows. const held = principal.wildcardGrants.get(t.perm.leaf); - return held ? permitsAction(held, action) : false; + return held ? permitsAction(held, assertedAction(t.perm.action)) : false; } if (principalHasGrantFor(principal.grantedRootTypes, t.perm.grantRoot)) return true; // Same mapping the permission check uses: `domain:admin` ⇒ `domains:delete`. - const capability = capabilityFor(t.perm.leaf, action); + const capability = capabilityFor(t.perm.leaf, assertedAction(t.perm.action)); return !!capability && !!principal.grantedCapabilities?.has(capability); }); } @@ -426,7 +419,6 @@ export function toClientTool(t: McpToolDef) { annotations: { readOnlyHint: t.annotations.readOnlyHint, destructiveHint: t.annotations.destructiveHint, - openWorldHint: t.annotations.openWorldHint, }, }; } diff --git a/apps/api/src/modules/mcp/mcp.routes.ts b/apps/api/src/modules/mcp/mcp.routes.ts index 16d90eab1..9a80ecf68 100644 --- a/apps/api/src/modules/mcp/mcp.routes.ts +++ b/apps/api/src/modules/mcp/mcp.routes.ts @@ -128,7 +128,6 @@ async function resolveMcpCaller(token: string, headers: Headers): Promise ({ pinned: vi.fn(), source: vi.fn(), target: vi.fn(), - list: vi.fn(), - handle: vi.fn(), produce: vi.fn(), restore: vi.fn(), dispose: vi.fn(), @@ -30,7 +28,7 @@ vi.mock("@repo/db", () => ({ activeDeploymentId: "build", }), }, - service: { listByProject: h.list }, + service: { listByProject: async () => [] }, deployment: { findById: async () => ({ containerId: "target-container" }) }, }, })); @@ -54,7 +52,7 @@ vi.mock("@repo/platform/engine/lib/project-runtime-lock", () => ({ withProjectRuntimeLock: async (_id: string, work: () => Promise) => work(), })); vi.mock("@repo/platform/engine/modules/backups/service-handle", () => ({ - serviceHandleFor: h.handle, + serviceHandleFor: vi.fn(), })); vi.mock("@repo/platform/engine/modules/services/service-container", () => ({ containerIdForService: vi.fn(), @@ -109,8 +107,6 @@ let target: BackupExecutor; beforeEach(() => { vi.resetAllMocks(); h.workspaceId = undefined; - h.list.mockResolvedValue([{ id: "db", name: "db", projectId: "project" }]); - h.handle.mockResolvedValue(handle); h.activity.mockImplementation(async (_id: string, work: () => Promise) => work()); h.pinned.mockResolvedValue({ ip: "203.0.113.8" }); target = { @@ -125,23 +121,12 @@ beforeEach(() => { }); }); describe("provider data copy", () => { - it("rejects a missing native target service before opening a source or restoring data", async () => { - h.list.mockResolvedValue([{ id: "other-service", name: "api", projectId: "project" }]); - await expect(copyPlatformData({ - runId: "run", service, projectId: "project", serviceId: "db", deploymentId: "build", - signal: new AbortController().signal, log: vi.fn(), progress: vi.fn(), - })).rejects.toMatchObject({ code: "IMPORT_TARGET_SERVICE_MISSING" }); - expect(h.source).not.toHaveBeenCalled(); - expect(h.restore).not.toHaveBeenCalled(); - expect(h.handle).not.toHaveBeenCalled(); - }); it("leaves a destination changed by the operator untouched", async () => { await expect( copyPlatformData({ runId: "run", service, projectId: "project", - serviceId: "db", deploymentId: "replaced-build", signal: new AbortController().signal, log: vi.fn(), @@ -189,10 +174,6 @@ describe("provider data copy", () => { ).rejects.toMatchObject({ code: "IMPORT_DATABASE_EXTENSIONS_MISSING" }); }); it("streams every byte with backpressure, verifies after restore and closes both transports", async () => { - const targetRow = { id: "db", name: "database", projectId: "project" }; - h.list.mockResolvedValue([ - { id: "api", name: "api", projectId: "project" }, targetRow, - ]); const payload = Buffer.alloc(256 * 1024, 0x41); let producerCompleted = false; h.produce.mockImplementation(async function* () { @@ -216,14 +197,12 @@ describe("provider data copy", () => { runId: "run", service, projectId: "project", - serviceId: "db", deploymentId: "build", signal: new AbortController().signal, log: vi.fn(), progress, }); expect(restored).toEqual(payload); - expect(h.handle).toHaveBeenCalledWith(targetRow, expect.objectContaining({ projectSlug: "app" })); expect(producerCompleted).toBe(true); expect(h.dispose).toHaveBeenCalledOnce(); expect(h.source).not.toHaveBeenCalled(); @@ -249,7 +228,6 @@ describe("provider data copy", () => { runId: "run", service, projectId: "project", - serviceId: "db", deploymentId: "build", signal: new AbortController().signal, log: vi.fn(), @@ -267,7 +245,6 @@ describe("provider data copy", () => { runId: "run", service, projectId: "project", - serviceId: "db", deploymentId: "build", signal: new AbortController().signal, log: vi.fn(), @@ -292,7 +269,6 @@ it("holds the owning Cloud workspace activity lock for the whole transfer", asyn runId: "run", service, projectId: "project", - serviceId: "db", deploymentId: "build", signal, log: vi.fn(), diff --git a/apps/api/src/modules/migration/platform-import-plan.test.ts b/apps/api/src/modules/migration/platform-import-plan.test.ts index 2acc649ba..910545e3f 100644 --- a/apps/api/src/modules/migration/platform-import-plan.test.ts +++ b/apps/api/src/modules/migration/platform-import-plan.test.ts @@ -134,7 +134,7 @@ async function review( } describe("reviewed platform imports", () => { - it("keeps secrets server-side and replaces provider database addresses with native service aliases", async () => { + it("keeps secrets server-side and replaces provider database addresses with shared project bindings", async () => { const plan = await review(); expect(plan.ready).toBe(true); expect(plan.requiresWritePause).toBe(true); @@ -147,15 +147,7 @@ describe("reviewed platform imports", () => { valueTemplate: "postgres://app:source-secret@${host}/app", }, ]); - expect(privatePlan.services[1].environment.DATABASE_URL).toBe( - "postgres://app:source-secret@database/app", - ); - expect(privatePlan.projects[0].create.name).toBe("Project"); - expect(privatePlan.projects[0].create.services?.map((row) => row.name)).toEqual([ - "database", - "website", - ]); - expect(JSON.stringify(privatePlan.projects)).not.toContain("source-secret"); + expect(privatePlan.services[1].environment).not.toHaveProperty("DATABASE_URL"); expect(privatePlan.services[0].environment.PGHOST).toBe( privatePlan.services[0].create.internalAlias, ); @@ -183,113 +175,6 @@ describe("reviewed platform imports", () => { code: "IMPORT_SOURCE_CHANGED", }); }); - it("names storage per service inside one destination project", async () => { - inventory.services[1].volumes = [{ id: "files", mountPath: "/data" }]; - const plan = await loadReviewedImport(ctx, (await review()).planId); - expect(plan.projects[0].create.services?.flatMap((service) => service.volumes ?? [])).toEqual([ - "database-data-0:/var/lib/postgresql/data", - "website-data-0:/data", - ]); - expect(plan.projects[0].create.services?.[1].dependsOn).toEqual(["database"]); - }); - it.each(["repository", "commit", "branch"])( - "splits incompatible Git %s without losing revisions or private connections", - async (difference) => { - inventory.services = ["one", "two"].map((id) => - service({ - id, - name: id, - image: undefined, - repository: difference === "repository" ? `owner/${id}` : "owner/repo", - commit: (difference === "commit" && id === "two" ? "b" : "a").repeat(40), - branch: difference === "branch" ? id : "main", - privateDomain: `${id}.railway.internal`, - env: id === "two" ? { API_URL: "http://one.railway.internal:3000/api?secret=keep" } : {}, - }), - ); - const result = await review( - inventory.services.map((service) => ({ - id: service.id, - name: service.name, - data: "empty", - })), - ); - expect(result.ready, JSON.stringify(result)).toBe(true); - expect(result.projects).toEqual([ - { name: "project-one", serviceIds: ["one"] }, - { name: "project-two", serviceIds: ["two"] }, - ]); - const plan = await loadReviewedImport(ctx, result.planId); - expect(plan.projects.map((project) => project.create.gitRepo)).toEqual( - difference === "repository" ? ["one", "two"] : ["repo", "repo"], - ); - expect(plan.services[1].bindings).toEqual([ - { - sourceId: "one", - envKey: "API_URL", - valueTemplate: "http://${host}:3000/api?secret=keep", - }, - ]); - expect(plan.services.map((s) => s.source.commit)).toEqual( - inventory.services.map((s) => s.commit), - ); - expect(h.info.mock.calls.map(([input]) => input.owner)).toEqual(["owner", "owner"]); - expect(h.info.mock.calls.map(([input]) => input.branch)).toEqual( - inventory.services.map((s) => s.commit), - ); - }, - ); - it("keeps compatible source services together and rejects composite cross-project variables during review", async () => { - const git = (id: string, repository: string) => - service({ - id, - name: id, - image: undefined, - repository, - commit: "a".repeat(40), - privateDomain: `${id}.railway.internal`, - }); - inventory.services = [git("one", "owner/repo"), git("two", "owner/repo")]; - const choices = () => - inventory.services.map((s) => ({ id: s.id, name: s.name, data: "empty" as const })); - expect((await review(choices())).projects).toEqual([ - { name: "Project", serviceIds: ["one", "two"] }, - ]); - inventory.services.push(git("three", "owner/other")); - inventory.services[2].env = { HOSTS: "one.railway.internal,two.railway.internal" }; - const result = await review(choices()); - expect(result.ready).toBe(false); - expect(result.services[2].blockers.join(" ")).toContain("separate connection variable"); - }); - it("blocks unavailable private listeners and ambiguous host templates before source downtime", async () => { - inventory.services = [ - service({ - id: "store", - name: "store", - port: undefined, - privateDomain: "store.railway.internal", - }), - ...["one", "two"].map((id) => - service({ - id, - name: id, - image: undefined, - repository: `owner/${id}`, - commit: "a".repeat(40), - env: - id === "one" - ? { HOST: "store.railway.internal" } - : { HOST: "store.railway.internal-${host}" }, - }), - ), - ]; - const result = await review( - inventory.services.map((s) => ({ id: s.id, name: s.name, data: "empty" })), - ); - expect(result.ready).toBe(false); - expect(result.services[1].blockers.join(" ")).toContain("private listener port"); - expect(result.services[2].blockers.join(" ")).toContain("cannot be safely converted"); - }); it("ignores pagination order and changing volume size, but never ignores changed configuration", () => { const next = structuredClone(inventory); next.services.reverse(); @@ -317,22 +202,16 @@ describe("reviewed platform imports", () => { const reviewed = await review(); expect(reviewed.ready).toBe(true); expect( - (await loadReviewedImport(ctx, reviewed.planId)).services[1].environment.DATABASE_URL, - ).toBe("postgres://app:source-secret@database/app"); + (await loadReviewedImport(ctx, reviewed.planId)).services[1].bindings[0].valueTemplate, + ).toBe("postgres://app:source-secret@${host}/app"); }); - it("rejects conflicting service names and enforces destination access before planning", async () => { + it("rejects conflicting project names and enforces destination access before planning", async () => { await expect( review([ { id: "db", name: "Same Name", data: "copy" }, { id: "app", name: "same-name", data: "empty" }, ]), ).rejects.toMatchObject({ code: "IMPORT_NAME_INVALID" }); - await expect( - review([ - { id: "db", name: "api.v2", data: "copy" }, - { id: "app", name: "api v2", data: "empty" }, - ]), - ).rejects.toMatchObject({ code: "IMPORT_NAME_INVALID" }); h.authorize.mockRejectedValue(new Error("forbidden")); await expect(review()).rejects.toThrow("forbidden"); }); @@ -373,7 +252,7 @@ describe("reviewed platform imports", () => { { sourceId: external.id, envKey: "DATABASE_URL" }, ]); expect(privatePlan.services[1].create.services?.[0].volumes).toEqual([ - "database-data-0:/var/lib/postgresql", + "data-0:/var/lib/postgresql", ]); // Supplying secrets does not falsely report provider configuration drift. expect(h.discover).toHaveBeenCalledTimes(2); @@ -402,9 +281,6 @@ it("uses the existing Compose build for a custom Dockerfile and preserves readin readiness: { path: "/health" }, services: [{ build: "apps/api", dockerfile: "docker/production.Dockerfile" }], }); - expect(plan.projects[0].create.services?.[0].advanced).toMatchObject({ - readiness: { path: "/health", port: 3000 }, - }); expect(h.info).not.toHaveBeenCalled(); }); it("blocks an unavailable custom Dockerfile before import", async () => { diff --git a/apps/api/src/modules/migration/platform-import-worker.test.ts b/apps/api/src/modules/migration/platform-import-worker.test.ts index 446bd3f5c..2f4eaf5e9 100644 --- a/apps/api/src/modules/migration/platform-import-worker.test.ts +++ b/apps/api/src/modules/migration/platform-import-worker.test.ts @@ -1,26 +1,20 @@ import { beforeEach, describe, expect, it, vi } from "vitest"; -import { AppError, ConflictError } from "@repo/core"; +import { AppError } from "@repo/core"; import { withProjectRuntimeLock } from "@repo/platform/engine/lib/project-runtime-lock"; import type { ExecutionContext } from "@repo/platform"; import type { PrivateImportPlan, PlannedImportService, } from "@repo/platform/engine/modules/migration/platform-import-plan"; -import { platformImportProjects } from "@repo/platform/engine/modules/migration/platform-import-project"; const h = vi.hoisted(() => ({ ensure: vi.fn(), merge: vi.fn(), - list: vi.fn(), - project: vi.fn(), - sourceService: vi.fn(), - rows: [] as Array<{ id: string; projectId: string; name: string }>, - view: vi.fn(), connect: vi.fn(), + view: vi.fn(), deploy: vi.fn(), copy: vi.fn(), preflight: vi.fn(), prepareTarget: vi.fn(), - routes: vi.fn(), authorize: vi.fn(), disable: vi.fn(), bind: vi.fn(), @@ -35,8 +29,7 @@ const h = vi.hoisted(() => ({ vi.mock("@repo/db", () => ({ withAdvisoryLock: async (_key: string, fn: () => Promise) => fn(), repos: { - service: { listByProject: h.list }, - project: { update: h.update, findById: h.project }, + project: { update: h.update, findById: async (id: string) => ({ id, workspaceId: null }) }, dockerMigrationRun: { bindImportedProject: h.bind, findById: h.find, @@ -47,11 +40,11 @@ vi.mock("@repo/db", () => ({ vi.mock("@repo/platform/engine/modules/projects/project-crud.service", () => ({ ensureProject: h.ensure, })); -vi.mock("@repo/platform/engine/modules/services/service-environment-state", () => ({ - mergeServiceEnvVars: h.merge, +vi.mock("@repo/platform/engine/modules/projects/project-env.service", () => ({ + mergeEnvVars: h.merge, })); -vi.mock("@repo/platform/engine/modules/services/service.service", () => ({ - createService: h.sourceService, +vi.mock("@repo/platform/engine/modules/projects/project-connection.service", () => ({ + createConnection: h.connect, })); vi.mock("@repo/platform/engine/modules/projects/project-runtime.service", () => ({ disableProject: h.disable, @@ -59,9 +52,6 @@ vi.mock("@repo/platform/engine/modules/projects/project-runtime.service", () => vi.mock("@repo/platform/engine/modules/apps/app-settings.service", () => ({ getAppConnectionView: h.view, })); -vi.mock("@repo/platform/engine/modules/projects/project-connection.service", () => ({ - createConnection: h.connect, -})); vi.mock("@repo/platform/engine/modules/deployments/build.service", () => ({ triggerDeployment: h.deploy, })); @@ -72,9 +62,6 @@ vi.mock("@repo/platform/engine/modules/migration/platform-import-data", () => ({ vi.mock("@repo/platform/engine/modules/migration/migration-runtime", () => ({ prepareMigrationTarget: h.prepareTarget, })); -vi.mock("@repo/platform/engine/modules/migration/migration-routes", () => ({ - saveMigrationRoutes: h.routes, -})); vi.mock("@repo/platform/engine/modules/migration/platform-import-health", () => ({ verifyPlatformDeployment: h.verify, })); @@ -109,11 +96,7 @@ const service = (id: string, kind: "app" | "database" | "worker"): PlannedImport ...(kind === "database" ? { database: "pg_dump" } : { commit: "a".repeat(40), branch: "main" }), }, data: "copy", - create: { - name: id, - internalAlias: id, - services: [{ name: id, image: "image:1", volumes: [`${id}-data:/data`] }], - }, + create: { name: id }, environment: { TOKEN: "secret" }, bindings: [], }); @@ -124,19 +107,11 @@ const planFor = (services: PlannedImportService[]) => userId: "user", targetServerId: "server", services, - projectName: "imported-project", - projects: platformImportProjects("imported-project", "server", services), }) as PrivateImportPlan; let row: any; beforeEach(() => { vi.resetAllMocks(); h.events.length = 0; - h.rows.length = 0; - h.routes.mockResolvedValue([]); - h.project.mockImplementation(async (id) => ({ id, workspaceId: null })); - h.list.mockImplementation(async (projectId) => - h.rows.filter((row) => row.projectId === projectId), - ); row = { id: "run", organizationId: "org", @@ -154,43 +129,24 @@ beforeEach(() => { }); h.ensure.mockImplementation(async (body) => { h.events.push(`create:${body.name}`); - h.rows.push( - ...body.services.map((row: { name: string }) => ({ - ...row, - id: `${body.name}-${row.name}`, - projectId: body.name, - })), - ); return { project_id: body.name }; }); - h.sourceService.mockImplementation(async (_ctx, projectId, body) => { - h.rows.push({ ...body, id: `${projectId}-${body.name}`, projectId }); - }); - let deploymentCount = 0; h.deploy.mockImplementation(async (_ctx, input) => { - h.events.push(`deploy:${input.projectId}:${input.serviceIds.length}`); - return { deployment: { id: `${input.projectId}-build-${++deploymentCount}` } }; + h.events.push(`deploy:${input.projectId}`); + return { deployment: { id: `${input.projectId}-build` } }; }); h.copy.mockImplementation(async (input) => { - h.events.push(`copy:${input.service.source.id}`); + h.events.push(`copy:${input.projectId}`); + }); + h.view.mockResolvedValue({ + outputs: [{ id: "database-url", internal: true, value: "postgres://new" }], }); - h.view.mockImplementation(async () => ({ - outputs: h.rows.map((row) => ({ - id: `${row.id}:url`, - sourceServiceId: row.id, - internal: true, - value: "postgres://new", - })), - })); h.prepareSource.mockImplementation(async () => { h.events.push("pause-project"); }); h.restoreSource.mockImplementation(async (_run, resume) => { h.events.push(resume ? "resume-project" : "restore-config"); }); - h.connect.mockImplementation(async (_ctx, target, input) => { - h.events.push(`connect:${input.sourceProjectId}:${target}`); - }); }); const lifecycle = (signal = new AbortController().signal) => ({ signal, @@ -203,149 +159,6 @@ const lifecycle = (signal = new AbortController().signal) => ({ }), }); describe("provider import through normal project operations", () => { - it("copies all volumes before deploying multiple repositories in dependency order with native links", async () => { - const db = service("db", "database"), - app = service("app", "app"), - worker = service("worker", "worker"); - for (const entry of [app, worker]) - Object.assign(entry.create, { - gitProvider: "github", - gitOwner: "owner", - gitRepo: entry.source.id, - gitBranch: "main", - }); - worker.source.commit = "b".repeat(40); - app.bindings = [ - { sourceId: "db", envKey: "DB_URL", valueTemplate: "postgres://secret@${host}:5432/store" }, - ]; - worker.bindings = [{ sourceId: "app", envKey: "APP_HOST", valueTemplate: "${host}" }]; - app.environment.DB_URL = "postgres://secret@db:5432/store"; - worker.environment.APP_HOST = "app"; - const services = [worker, app, db]; - const plan = { ...planFor(services), sourceControl: "railway-project" as const }; - await executePlatformImport(ctx, "run", plan, lifecycle()); - expect(h.ensure.mock.calls.map(([body]) => body.gitRepo)).toEqual(["worker", "app", undefined]); - expect( - h.ensure.mock.calls.every(([body]) => body.services.every((s: any) => !s.dependsOn.length)), - ).toBe(true); - expect(h.copy.mock.calls.map(([input]) => [input.projectId, input.serviceId])).toEqual([ - ["imported-project-db", "imported-project-db-db"], - ["imported-project-app", "imported-project-app-app"], - ["imported-project-worker", "imported-project-worker-worker"], - ]); - expect(h.events.indexOf("copy:worker")).toBeLessThan( - h.events.indexOf("deploy:imported-project-db:1"), - ); - expect(h.events.indexOf("healthy:imported-project-db-build-1")).toBeLessThan( - h.events.indexOf("connect:imported-project-db:imported-project-app"), - ); - expect(h.events.indexOf("connect:imported-project-db:imported-project-app")).toBeLessThan( - h.events.indexOf("deploy:imported-project-app:1"), - ); - expect(h.connect).toHaveBeenCalledWith( - ctx, - "imported-project-app", - { - sourceProjectId: "imported-project-db", - outputId: "imported-project-db-db:url", - envKey: "DB_URL", - mode: "internal", - valueTemplate: "postgres://secret@${host}:5432/store", - }, - { defer: true }, - ); - expect( - h.merge.mock.calls.flatMap(([, , , input]) => input.upserts.map((v: any) => v.key)), - ).not.toContain("DB_URL"); - expect(h.deploy.mock.calls.map(([, input]) => [input.projectId, input.commitSha])).toEqual([ - ["imported-project-db", undefined], - ["imported-project-app", "a".repeat(40)], - ["imported-project-worker", "b".repeat(40)], - ]); - expect(h.verify).toHaveBeenCalledTimes(3); - expect(row.recovery.providerImport.completed).toEqual(["db", "app", "worker"]); - }); - it("does not start a cross-project consumer if its private connection fails", async () => { - const db = service("db", "database"), - app = service("app", "app"), - worker = service("worker", "worker"); - for (const entry of [app, worker]) - Object.assign(entry.create, { gitOwner: "owner", gitRepo: entry.source.id }); - app.bindings = [{ sourceId: "db", envKey: "DB_URL" }]; - const plan = { ...planFor([app, db, worker]), sourceControl: "railway-project" as const }; - row.recovery.providerImport.planEnc = JSON.stringify(plan); - h.connect.mockRejectedValue(new Error("Private network unavailable")); - await expect(executePlatformImport(ctx, "run", plan, lifecycle())).rejects.toThrow( - "Private network unavailable", - ); - expect(h.deploy).toHaveBeenCalledTimes(1); - expect(row.recovery.providerImport.completed).toEqual([]); - expect(h.restoreSource).not.toHaveBeenCalledWith("run", true, expect.anything()); - await pauseFailedPlatformImport("run"); - expect(h.disable).toHaveBeenCalledExactlyOnceWith( - "imported-project-db", - "org", - "imported-project-db-build-1", - ); - expect(h.restoreSource).toHaveBeenLastCalledWith("run", true); - expect(h.disable.mock.invocationCallOrder[0]).toBeLessThan( - h.restoreSource.mock.invocationCallOrder[1], - ); - }); - it("stages custom domains through native migration routing before pausing the source", async () => { - const web = service("web", "app"); - web.create.name = "storefront"; - web.source.domains = [ - { hostname: "shop.example.com", portable: true }, - { hostname: "www.example.com", portable: true }, - { hostname: "shop.up.railway.app", portable: false }, - ]; - const plan = { ...planFor([web]), sourceControl: "railway-project" as const }; - const flow = lifecycle(); - await executePlatformImport(ctx, "run", plan, flow); - expect(h.routes).toHaveBeenCalledWith( - ctx, - "imported-project", - { - storefront: [ - { domainType: "custom", customDomain: "shop.example.com" }, - { domainType: "custom", customDomain: "www.example.com" }, - ], - }, - flow.log, - ); - expect(h.routes.mock.invocationCallOrder[0]).toBeLessThan( - h.prepareSource.mock.invocationCallOrder[0], - ); - expect(h.routes.mock.invocationCallOrder[0]).toBeLessThan(h.copy.mock.invocationCallOrder[0]); - }); - - it("reports domain conflicts without pausing Railway or deploying the destination", async () => { - const app = service("app", "app"); - app.source.domains = [{ hostname: "taken.example.com", portable: true }]; - h.routes.mockRejectedValueOnce( - new ConflictError("The domain is already connected to another project."), - ); - await expect( - executePlatformImport( - ctx, - "run", - { - ...planFor([app]), - sourceControl: "railway-project", - }, - lifecycle(), - ), - ).rejects.toMatchObject({ - statusCode: 409, - code: "IMPORT_DOMAIN_REVIEW_REQUIRED", - message: "The domain is already connected to another project.", - }); - expect(h.prepareSource).not.toHaveBeenCalled(); - expect(h.copy).not.toHaveBeenCalled(); - expect(h.deploy).not.toHaveBeenCalled(); - }); - it("prepares managed capacity before pausing Railway and does not stop the source if provisioning fails", async () => { const plan = { ...planFor([service("app", "app")]), sourceControl: "railway-project" as const }; const flow = lifecycle(); @@ -381,136 +194,6 @@ describe("provider import through normal project operations", () => { expect(h.events.indexOf("pause-project")).toBeLessThan(h.events.indexOf("copy:db")); expect(h.events.indexOf("restore-config")).toBeLessThan(firstDeployment); expect(h.copy.mock.calls.every(([input]) => input.deploymentId === undefined)).toBe(true); - expect(h.ensure).toHaveBeenCalledTimes(1); - expect(h.deploy).toHaveBeenCalledTimes(1); - expect(new Set(h.copy.mock.calls.map(([input]) => input.projectId))).toEqual( - new Set(["imported-project"]), - ); - expect(new Set(h.copy.mock.calls.map(([input]) => input.serviceId)).size).toBe(3); - expect(new Set(Object.values(row.recovery.providerImport.projects))).toEqual( - new Set(["imported-project"]), - ); - }); - it("imports two source projects as two native projects, keeping identical service names separate", async () => { - for (const name of ["first-project", "second-project"]) { - const services = [service("db", "database"), service("app", "app")]; - services.forEach((service) => (service.transfer = "cold-volume")); - const plan = { ...planFor(services), sourceControl: "railway-project" as const }; - plan.projectName = name; - plan.projects[0].create.name = name; - await executePlatformImport(ctx, name, plan, lifecycle()); - expect(new Set(Object.values(row.recovery.providerImport.projects))).toEqual(new Set([name])); - } - expect(h.ensure.mock.calls.map(([body]) => body.name)).toEqual([ - "first-project", - "second-project", - ]); - expect(h.rows.map((row) => row.projectId)).toEqual([ - "first-project", - "first-project", - "second-project", - "second-project", - ]); - expect(h.copy.mock.calls.map(([input]) => [input.projectId, input.serviceId])).toEqual([ - ["first-project", "first-project-db"], - ["first-project", "first-project-app"], - ["second-project", "second-project-db"], - ["second-project", "second-project-app"], - ]); - }); - it("stores each service's environment separately instead of merging it into project-wide values", async () => { - const app = service("app", "app"), - db = service("db", "database"); - app.environment = { PORT: "3000", TOKEN: "app-secret" }; - db.environment = { PORT: "5432", TOKEN: "database-secret" }; - await executePlatformImport(ctx, "run", planFor([app, db]), lifecycle()); - for (const entry of [app, db]) { - expect(h.merge).toHaveBeenCalledWith( - ctx, - "imported-project", - `imported-project-${entry.source.id}`, - { - environment: "production", - deletes: [], - upserts: Object.entries(entry.environment).map(([key, value]) => ({ - key, - value, - isSecret: true, - sourceId: null, - })), - }, - ); - } - }); - it("adds a source-built app through the native service creator in the same project", async () => { - const app = service("app", "app"); - app.create = { - name: "app", - gitOwner: "owner", - gitRepo: "repo", - gitBranch: "main", - framework: "nextjs", - rootDirectory: "apps/web", - installCommand: "bun install", - startCommand: "bun start", - port: 3000, - }; - await executePlatformImport(ctx, "run", planFor([app, service("db", "database")]), lifecycle()); - expect(h.ensure).toHaveBeenCalledTimes(1); - expect(h.sourceService).toHaveBeenCalledWith( - ctx, - "imported-project", - expect.objectContaining({ - name: "app", - kind: "monorepo", - rootDirectory: "apps/web", - framework: "nextjs", - ports: ["3000"], - exposed: false, - }), - ); - expect(h.deploy).toHaveBeenLastCalledWith( - ctx, - expect.objectContaining({ - projectId: "imported-project", - commitSha: "a".repeat(40), - }), - ); - }); - it("rejects reviews without destination projects before allocating a destination", async () => { - const plan = planFor([service("app", "app")]); - delete (plan as Partial).projects; - await expect(executePlatformImport(ctx, "run", plan, lifecycle())).rejects.toMatchObject({ - code: "IMPORT_REVIEW_EXPIRED", - }); - expect(h.ensure).not.toHaveBeenCalled(); - expect(h.prepareSource).not.toHaveBeenCalled(); - }); - it("pauses a shared destination once before restoring the Railway source", async () => { - const plan = planFor([service("app", "app"), service("db", "database")]); - Object.assign(row.recovery.providerImport, { - planEnc: JSON.stringify(plan), - projects: { app: "shared-project", db: "shared-project" }, - deployments: { app: "shared-build", db: "shared-build" }, - }); - await pauseFailedPlatformImport("run"); - expect(h.disable).toHaveBeenCalledExactlyOnceWith("shared-project", "org", "shared-build"); - expect(h.restoreSource).toHaveBeenCalledTimes(1); - expect(h.disable.mock.invocationCallOrder[0]).toBeLessThan( - h.restoreSource.mock.invocationCallOrder[0], - ); - }); - it("can pause its own database-only predecessor when a complete deployment fails", async () => { - const plan = planFor([service("app", "app"), service("db", "database")]); - Object.assign(row.recovery.providerImport, { - planEnc: JSON.stringify(plan), - projects: { app: "shared", db: "shared" }, - deployments: { app: "failed-build", db: "failed-build" }, - ownedDeploymentIds: ["database-build", "failed-build"], - }); - h.project.mockResolvedValue({ id: "shared", activeDeploymentId: "database-build" }); - await pauseFailedPlatformImport("run"); - expect(h.disable).toHaveBeenCalledExactlyOnceWith("shared", "org", "database-build"); }); it("stops every imported Railway workload before resuming the source on failure", async () => { const plan = { @@ -536,43 +219,29 @@ describe("provider import through normal project operations", () => { const plan = planFor([worker, app, db]); await executePlatformImport(ctx, "run", plan, lifecycle()); expect(h.events).toEqual([ - "create:imported-project", - "deploy:imported-project:1", - "healthy:imported-project-build-1", + "create:db", + "create:app", + "create:worker", + "deploy:db", + "healthy:db-build", "copy:db", "copy:app", + "deploy:app", + "healthy:app-build", "copy:worker", - "deploy:imported-project:3", - "healthy:imported-project-build-2", + "deploy:worker", + "healthy:worker-build", ]); - expect(h.ensure).toHaveBeenCalledExactlyOnceWith(plan.projects[0].create, "org", ctx, { - mustCreate: true, - }); - expect(h.merge).toHaveBeenCalledWith( + expect(h.ensure).toHaveBeenCalledWith(app.create, "org", ctx, { mustCreate: true }); + expect(h.connect).toHaveBeenCalledWith( ctx, - "imported-project", - "imported-project-app", - expect.objectContaining({ - upserts: [{ key: "DATABASE_URL", value: "postgres://new", sourceId: null, isSecret: true }], - }), + "app", + { sourceProjectId: "db", outputId: "database-url", envKey: "DATABASE_URL", mode: "internal" }, + { defer: true }, ); - expect(h.deploy).toHaveBeenNthCalledWith( - 1, + expect(h.deploy).toHaveBeenCalledWith( ctx, - expect.objectContaining({ - projectId: "imported-project", - serviceIds: ["imported-project-db"], - strictServiceScope: true, - }), - ); - expect(h.deploy).toHaveBeenNthCalledWith( - 2, - ctx, - expect.objectContaining({ - projectId: "imported-project", - serviceIds: ["imported-project-db", "imported-project-app", "imported-project-worker"], - strictServiceScope: true, - }), + expect.objectContaining({ projectId: "app", commitSha: "a".repeat(40), branch: "main" }), ); expect(row.recovery.providerImport.completed).toEqual(["db", "app", "worker"]); }); @@ -584,13 +253,7 @@ describe("provider import through normal project operations", () => { executePlatformImport(ctx, "run", planFor([app, service("db", "database")]), lifecycle()), ).rejects.toThrow("restore failed"); expect(h.deploy).toHaveBeenCalledTimes(1); - expect(h.deploy).toHaveBeenCalledWith( - ctx, - expect.objectContaining({ - projectId: "imported-project", - serviceIds: ["imported-project-db"], - }), - ); + expect(h.deploy).toHaveBeenCalledWith(ctx, expect.objectContaining({ projectId: "db" })); }); it("checkpoints the created deployment before observing a cancelled phase", async () => { const flow = lifecycle(); @@ -600,7 +263,7 @@ describe("provider import through normal project operations", () => { await expect( executePlatformImport(ctx, "run", planFor([service("app", "app")]), flow), ).rejects.toThrow("cancelled"); - expect(row.recovery.providerImport.deployments).toEqual({ app: "imported-project-build-1" }); + expect(row.recovery.providerImport.deployments).toEqual({ app: "app-build" }); }); it("rejects dependency cycles rather than starting a partial recursive import", () => { const a = service("a", "app"), @@ -609,7 +272,7 @@ describe("provider import through normal project operations", () => { b.bindings = [{ sourceId: "a", envKey: "URL" }]; expect(() => orderedImports([a, b])).toThrow(/cycle/); }); - it("pauses imported deployment identities before releasing source recovery", async () => { + it("retains databases and pauses only the import's own app deployment identities on failure", async () => { const plan = planFor([service("app", "app"), service("db", "database")]); Object.assign(row.recovery.providerImport, { planEnc: JSON.stringify(plan), @@ -617,8 +280,7 @@ describe("provider import through normal project operations", () => { deployments: { app: "app-build", db: "db-build" }, }); await pauseFailedPlatformImport("run"); - expect(h.disable).toHaveBeenCalledWith("p-app", "org", "app-build"); - expect(h.disable).toHaveBeenCalledWith("p-db", "org", "db-build"); + expect(h.disable).toHaveBeenCalledExactlyOnceWith("p-app", "org", "app-build"); expect(row.recovery.providerImport.cleanupPending).toBe(false); }); it("leaves the cleanup checkpoint pending if the destination cannot be reached", async () => { diff --git a/apps/api/src/modules/migration/railway-wiring.test.ts b/apps/api/src/modules/migration/railway-wiring.test.ts index d21c42e47..f0ab87402 100644 --- a/apps/api/src/modules/migration/railway-wiring.test.ts +++ b/apps/api/src/modules/migration/railway-wiring.test.ts @@ -42,27 +42,6 @@ describe("provider-independent connection values", () => { }); }); describe("Railway project wiring", () => { - it("preserves self references and repeated case-insensitive dependency hosts in one connection", () => { - const db = service("db", {}, 5432); - const app = service("app", { - HOSTS: "DB.railway.internal,db.railway.internal,app.railway.internal", - }); - expect( - resolveRailwayBindings( - app, - new Map([ - ["db", db], - ["app", app], - ]), - ), - ).toEqual([ - { - sourceId: "db", - envKey: "HOSTS", - valueTemplate: "${host},${host},import-app", - }, - ]); - }); it("binds any private service without inferring its type from its image or variable names", () => { const store = service("store"); const app = service("app", { @@ -83,9 +62,7 @@ describe("Railway project wiring", () => { }, ]); expect(store.source.port).toBe(7878); - expect(app.source.env).toEqual({ - ARBITRARY_SETTING: "custom://alice:password@import-store:7878/second-db?option=1", - }); + expect(app.source.env).toEqual({}); }); it("keeps literal shared secrets and rewrites self-hosts without a recursive connection", () => { const store = service("store", { TOKEN: "secret", HOST: "store.railway.internal" }, 7878); @@ -101,23 +78,4 @@ describe("Railway project wiring", () => { expect(app.source.blockers.join(" ")).toMatch(/MISSING/); expect(app.source.blockers.join(" ")).toMatch(/UNRESOLVED/); }); - it("keeps hostname-only and multi-host values on the native project network", () => { - const db = service("db"), - redis = service("redis"); - const app = service("app", { - HOST: "db.railway.internal", - HOSTS: "db.railway.internal,redis.railway.internal", - }); - const bindings = resolveRailwayBindings( - app, - new Map([ - ["db", db], - ["redis", redis], - ["app", app], - ]), - ); - expect(app.source.env).toEqual({ HOST: "import-db", HOSTS: "import-db,import-redis" }); - expect(new Set(bindings.map((binding) => binding.sourceId))).toEqual(new Set(["db", "redis"])); - expect(app.source.blockers).toEqual([]); - }); }); diff --git a/apps/api/src/modules/projects/folder/folder.service.test.ts b/apps/api/src/modules/projects/folder/folder.service.test.ts index ac85c40ac..02b956160 100644 --- a/apps/api/src/modules/projects/folder/folder.service.test.ts +++ b/apps/api/src/modules/projects/folder/folder.service.test.ts @@ -59,7 +59,7 @@ describe("scanFolderSession", () => { expect(resolveFromLocalMock).toHaveBeenCalledWith(stagingDir, { env: { MY_VERSION: "1.2.3" }, composePath: "deploy/compose.yaml", - }, "app"); + }); expect(result.services).toBe(refreshed); expect(upload.services).toBe(initial); }); diff --git a/apps/api/src/modules/projects/project-cleanup.ref-shape.test.ts b/apps/api/src/modules/projects/project-cleanup.ref-shape.test.ts index ef4088610..f66e072ba 100644 --- a/apps/api/src/modules/projects/project-cleanup.ref-shape.test.ts +++ b/apps/api/src/modules/projects/project-cleanup.ref-shape.test.ts @@ -225,7 +225,7 @@ describe("Cloud Docker project teardown", () => { slug, domain: "opsh.io", namespace: fixture.namespace, - source_vm_id: fixture.scope.workspaceId, + source_workspace_id: fixture.scope.workspaceId, exported_path: `${cloudDockerProjectPaths(owner).routes}/${slug}`, }); return { ...fixture, addPage }; diff --git a/apps/api/src/modules/projects/project-clone.test.ts b/apps/api/src/modules/projects/project-clone.test.ts index 864a94be8..497aa8279 100644 --- a/apps/api/src/modules/projects/project-clone.test.ts +++ b/apps/api/src/modules/projects/project-clone.test.ts @@ -32,7 +32,8 @@ const h = { deletedAt: null, deletionInProgress: false, lifecycleOperation: { kind: "delete", status: "failed", error: "Previous cleanup failure" }, - iconUrl: "https://clincai.example/icon.png", + favicon: "https://clincai.example/favicon.ico", + faviconCheckedAt: new Date(), compositeRoutes: [{ host: "clincai.example" }], workspaceId: null, gitProvider: "github", @@ -193,7 +194,6 @@ describe("the copy direction is COPY-by-default", () => { await clone(); const p = clonedProject(); expect(p.framework).toBe("nextjs"); - expect(p.iconUrl).toBe("https://clincai.example/icon.png"); expect(p.routeStrategy).toBe("loopback"); expect(p.rollbackWindow).toBe(5); // Same for the service rows: a build command exists in no container. @@ -231,7 +231,7 @@ describe("what it deliberately does NOT copy", () => { const p = clonedProject(); // `id`/`groupId` are the insert's, and name/slug/serverId/workspaceId/activeDeploymentId are set // explicitly above — the rest must simply be absent. - for (const field of ["deletedAt", "deletionInProgress", "lifecycleOperation", "disabledAt", "compositeRoutes", "cloudPromotion", "id", "groupId", "createdAt", "updatedAt"]) { + for (const field of ["deletedAt", "deletionInProgress", "lifecycleOperation", "disabledAt", "favicon", "faviconCheckedAt", "compositeRoutes", "cloudPromotion", "id", "groupId", "createdAt", "updatedAt"]) { expect(p, field).not.toHaveProperty(field); } }); diff --git a/apps/api/src/modules/system/setup.controller.ts b/apps/api/src/modules/system/setup.controller.ts index 4770e16f6..47a90997f 100644 --- a/apps/api/src/modules/system/setup.controller.ts +++ b/apps/api/src/modules/system/setup.controller.ts @@ -356,7 +356,7 @@ export async function resetAdminPassword(c: Context) { // multi-user box the reset never lands on an arbitrary member row. const admin = await repos.user.findFoundingAdmin(); if (!admin) { - return c.json({ error: "No admin account exists yet — run `openship` and choose Create first admin, or run `openship up --non-interactive --admin-email ` with OPENSHIP_ADMIN_PASSWORD set." }, 409); + return c.json({ error: "No admin account exists yet — run `openship` to create one." }, 409); } const email = diff --git a/apps/api/test/e2e/catalog-inline-build.e2e.test.ts b/apps/api/test/e2e/catalog-inline-build.e2e.test.ts index 4acac1da7..a78afccd9 100644 --- a/apps/api/test/e2e/catalog-inline-build.e2e.test.ts +++ b/apps/api/test/e2e/catalog-inline-build.e2e.test.ts @@ -42,10 +42,7 @@ import { describeDockerE2E, dockerSocketPath, requireDocker } from "../helpers/d // real @repo/db. const { listByProjectMock } = vi.hoisted(() => ({ listByProjectMock: vi.fn() })); vi.mock("@repo/db", () => ({ - repos: { - service: { listByProject: listByProjectMock }, - project: { getEnvMap: async () => ({}) }, - }, + repos: { service: { listByProject: listByProjectMock } }, })); import { buildComposeImages } from "@repo/platform/engine/modules/deployments/compose/build.service"; @@ -139,7 +136,6 @@ describeDockerE2E("catalog inline build through the real build pipeline", () => dep: { id: "d-widget", branch: "main", - environment: "production", commitSha: null, trigger: "deploy", meta: null, diff --git a/apps/api/test/e2e/cloud-shared-workspace.e2e.test.ts b/apps/api/test/e2e/cloud-shared-workspace.e2e.test.ts index 15bc3624e..e7c29259f 100644 --- a/apps/api/test/e2e/cloud-shared-workspace.e2e.test.ts +++ b/apps/api/test/e2e/cloud-shared-workspace.e2e.test.ts @@ -152,13 +152,13 @@ describeDockerE2E("multiple projects on one subscribed Docker workspace", () => }; const vm = { id: providerVm, namespace, status: "running" }; const provider = { - vms: { + workspaces: { get: async () => vm, create: () => { throw new Error("Project operation attempted to create a second host"); }, }, - vm: () => ({ + workspace: () => ({ get: async () => vm, runtime: async () => providerRuntime, workloads: { list: async () => [] }, @@ -185,7 +185,7 @@ describeDockerE2E("multiple projects on one subscribed Docker workspace", () => domain: "opsh.io", url: `https://${input.slug}.opsh.io`, namespace, - source_vm_id: input.vm_id, + source_workspace_id: input.workspace_id, exported_path: input.path, }; pages.set(input.slug, page); @@ -359,7 +359,7 @@ describeDockerE2E("multiple projects on one subscribed Docker workspace", () => ); expect((await a.listAllContainers()).map((row) => row.id)).toEqual([aId]); expect(routes.get(`${ids[0]}.opsh.io`).routes[0].action).toMatchObject({ - vm: providerVm, + workspace: providerVm, port: first.hostPortByContainerPort?.[8080], }); }); diff --git a/apps/api/test/e2e/fixtures/instance-api.ts b/apps/api/test/e2e/fixtures/instance-api.ts index 7bf882126..97f198dea 100644 --- a/apps/api/test/e2e/fixtures/instance-api.ts +++ b/apps/api/test/e2e/fixtures/instance-api.ts @@ -135,7 +135,7 @@ export async function startApi(input: { } export async function stopApi(api: RunningApi): Promise { - if (api.child.exitCode === null && api.child.signalCode === null) { + if (api.child.exitCode === null) { api.child.kill("SIGTERM"); const exited = new Promise((resolve) => api.child.once("exit", () => resolve(true))); if (!(await Promise.race([exited, delay(15_000).then(() => false)]))) { diff --git a/apps/api/test/e2e/instance-handoff.e2e.test.ts b/apps/api/test/e2e/instance-handoff.e2e.test.ts index e39c61903..0bb185c46 100644 --- a/apps/api/test/e2e/instance-handoff.e2e.test.ts +++ b/apps/api/test/e2e/instance-handoff.e2e.test.ts @@ -5,7 +5,7 @@ import { createRequire } from "node:module"; import { execFile } from "node:child_process"; import { promisify } from "node:util"; import { afterAll, expect, it } from "vitest"; -import { createServer, request as httpRequest, type Server } from "node:http"; +import { createServer, type Server } from "node:http"; import { createHmac } from "node:crypto"; import { freePort, startApi, stopApi, jsonRequest, type RunningApi } from "./fixtures/instance-api"; import type { DataTransferFile } from "../../src/modules/system/data-transfer/types"; @@ -433,47 +433,6 @@ it("resumes after a lost activation acknowledgement without reimporting or start ).toBe(newer.id); }, 120_000); -it.each(["resume", "cancel"] as const)("recovers a persisted quiescing source after restart with %s", async action => { - const { source, target } = await pair(); - const original = await createProject(source, "Before interrupted drain"); - const offer = await post<{ code: string }>(target, "/api/system/instance/offer", { direction: "target" }); - // A real admitted mutation waits for its remaining request body. The move must - // keep waiting for it, rather than treating an incomplete drain as a snapshot. - const held = httpRequest(`${source.baseUrl}/api/projects`, { - method: "POST", headers: { "content-type": "application/json" }, - }); - held.on("error", () => { /* The fixture intentionally interrupts this request. */ }); - held.write('{"name":'); - let restarted: RunningApi | undefined; - try { - await post(source, "/api/system/instance/move", { code: offer.code, confirmReplace: true }); - await expect.poll(async () => (await state(source)).role, { timeout: 15_000 }).toBe("quiescing"); - const exited = new Promise(resolve => source.child.once("exit", () => resolve())); - source.child.kill("SIGKILL"); // simulate a crash after the durable fence - await exited; - held.destroy(); - restarted = await startApi({ dbDir: source.dbDir, port: source.port, secret: source.secret }); - apis.push(restarted); - expect(await state(restarted)).toMatchObject({ role: "quiescing", handoff: { running: false } }); - expect((await fetch(`${restarted.baseUrl}/api/health`)).status).toBe(200); - expect((await fetch(`${restarted.baseUrl}/api/projects`)).status).toBe(503); - await post(restarted, `/api/system/instance/${action}`); - if (action === "resume") { - await waitMove(restarted); - expect((await state(target)).role).toBe("active"); - expect((await jsonRequest<{ data: { id: string } }>(target.baseUrl, `/api/projects/${original.id}`)).data.id).toBe(original.id); - } else { - expect(await state(restarted)).toMatchObject({ role: "active", handoff: { status: "aborted" } }); - expect((await jsonRequest<{ data: { id: string } }>(restarted.baseUrl, `/api/projects/${original.id}`)).data.id).toBe(original.id); - } - } finally { - held.destroy(); - await stopApi(source); - await stopApi(target); - if (restarted) await stopApi(restarted); - } -}, 120_000); - it("cancels a prepared but unactivated receiver and restores its recovery archive", async () => { const { source, target } = await pair(); const old = await createProject(target, "Receiver original"); diff --git a/apps/api/test/e2e/platform-import-data.e2e.test.ts b/apps/api/test/e2e/platform-import-data.e2e.test.ts index ac15215ea..ef24f936c 100644 --- a/apps/api/test/e2e/platform-import-data.e2e.test.ts +++ b/apps/api/test/e2e/platform-import-data.e2e.test.ts @@ -23,15 +23,14 @@ import { describeDockerE2E, requireDocker, dockerSocketPath } from "../helpers/d const h = vi.hoisted(() => ({ project: {} as any, source: undefined as unknown, - service: undefined as any, runtime: undefined as unknown, workspaceId: undefined as string | undefined, exportOnly: vi.fn(), })); vi.mock("@repo/db", () => ({ repos: { - project: { findById: async () => h.project, getEnvMap: async () => ({}) }, - service: { listByProject: async () => h.service ? [h.service] : [] }, + project: { findById: async () => h.project }, + service: { listByProject: async () => [] }, }, })); vi.mock("@repo/platform/engine/modules/migration/migration-access", () => ({ @@ -379,16 +378,10 @@ describeDockerE2E("generic stopped-volume provider import", () => { environment: {}, bindings: [], } as PlannedImportService; - h.service = { - id: `${projectId}-service`, projectId, name: fixture.name, - image: fixture.image, environment: {}, - volumes: service.create.volumes, namespaceVolumes: true, - }; const args = { runId: tag, service, projectId, - serviceId: h.service.id, signal: new AbortController().signal, log: () => {}, progress: vi.fn(), diff --git a/apps/api/test/e2e/platform-import-project.e2e.test.ts b/apps/api/test/e2e/platform-import-project.e2e.test.ts deleted file mode 100644 index b8de6a4ca..000000000 --- a/apps/api/test/e2e/platform-import-project.e2e.test.ts +++ /dev/null @@ -1,569 +0,0 @@ -import { afterAll, beforeAll, expect, it, vi } from "vitest"; -import { randomUUID } from "node:crypto"; -import { spawn } from "node:child_process"; -import { createConnection } from "node:net"; -import { once } from "node:events"; -import { mkdtemp, rm, writeFile } from "node:fs/promises"; -import { tmpdir } from "node:os"; -import { join } from "node:path"; -import { - BuildLogger, - CommandSourceBackupExecutor, - CloudDockerRuntime, - DockerRuntime, - type CommandExecutor, -} from "@repo/adapters"; -import { CloudServerConnection } from "../../../../packages/adapters/src/runtime/cloud/server-connection"; -import { CloudWorkspaceExecutor } from "../../../../packages/adapters/src/runtime/cloud/workspace-executor"; -import { db, repos, schema } from "@repo/db"; -import type { ExecutionContext } from "@repo/platform"; -import type { ProviderInventory } from "@repo/platform/engine/modules/migration/providers/types"; -import { encrypt, decryptEnvMap } from "@repo/platform/engine/lib/encryption"; -import { deployComposeServices } from "@repo/platform/engine/modules/deployments/compose/deploy.service"; -import { projectServicesToDeployableServices } from "@repo/platform/engine/modules/deployments/compose/project-services"; -import { seedDeployment, seedOrg, setActive } from "../helpers/seed"; -import { describeDockerE2E, requireDocker, dockerSocketPath } from "../helpers/docker-e2e"; -import { refreshConnectionEnv } from "@repo/platform/engine/modules/projects/project-connection.service"; -import { - sharedServiceAlias, - sharedServiceNetwork, -} from "@repo/platform/engine/modules/projects/shared-service-network"; - -// Substitute Railway's control/SSH boundary, Git checkout, destination resolution -// and the asynchronous build queue. All runtime operations use an isolated daemon. -// Review, project creation, encrypted environments, migration checkpoints, -// volume transfer and the ordinary Compose deployment engine remain real. -const h = vi.hoisted(() => ({ - discover: vi.fn(), - prepare: vi.fn(), - assertStopped: vi.fn(), - openSource: vi.fn(), - runtime: vi.fn(), - deploy: vi.fn(), -})); -vi.mock("@repo/platform/engine/modules/credentials/connection-authorization", () => ({ - getProviderAccess: async () => ({ provider: "railway", publicFields: {}, secrets: {} }), -})); -vi.mock("@repo/platform/engine/modules/migration/providers/railway", () => ({ - railwayMigrationProvider: { discover: h.discover }, -})); -vi.mock("@repo/platform/engine/modules/migration/providers/railway-project-transfer", () => ({ - prepareRailwayProjectTransfer: h.prepare, - assertRailwayExportOnly: h.assertStopped, - restoreRailwayProjectTransfer: async () => {}, -})); -vi.mock("@repo/platform/engine/modules/migration/providers/railway-data", () => ({ - openRailwayDataSource: h.openSource, -})); -vi.mock("@repo/platform/engine/modules/migration/migration-runtime", async (original) => ({ - ...(await original()), - createMigrationDockerRuntime: h.runtime, -})); -vi.mock("@repo/platform/engine/modules/services/service-container", async (original) => ({ - ...(await original()), - // Resolve private-link operations onto the same isolated daemon as the import. - // Connection authorization, persistence, DNS and network attachment stay real. - resolveServicePlatform: async () => ({ platform: { runtime: await h.runtime() } }), -})); -vi.mock("@repo/platform/engine/modules/deployments/build.service", () => ({ - triggerDeployment: h.deploy, -})); -vi.mock("@repo/platform/engine/modules/deployments/project-reader", () => ({ - createGitHubReader: () => ({ readText: async () => "FROM redis:7-alpine\n" }), -})); -import { - discoverPlatform, - reviewPlatform, - loadReviewedImport, -} from "@repo/platform/engine/modules/migration/platform-import-plan"; -import { executePlatformImport } from "@repo/platform/engine/modules/migration/platform-import-worker"; - -describeDockerE2E("Railway projects retain native service boundaries", () => { - const tag = `import-groups-${randomUUID().slice(0, 8)}`; - const containers = new Set(); - const volumes = new Set(); - const images = new Set(); - const sharedNetworks = new Set(); - const projects: Array<{ id: string; slug: string }> = []; - const sources = new Map(); - let runtime: DockerRuntime; - const exec = async (id: string, command: string) => - (await (await runtime.inContainerExecutor(id)).exec(command)).trim(); - - beforeAll(async () => { - await requireDocker(); - runtime = await DockerRuntime.create({ transport: "socket" }); - await runtime.pullImage("redis:7-alpine"); - await runtime.pullImage("alpine:3"); - const host = await runtime.docker.createContainer({ - Image: "alpine:3", - Cmd: ["sleep", "infinity"], - Labels: { "openship.test": tag }, - HostConfig: { NetworkMode: "host" }, - }); - containers.add(host.id); - await host.start(); - vi.spyOn(CloudServerConnection.prototype, "connectDocker").mockImplementation(async () => { - const socket = createConnection(dockerSocketPath); - await once(socket, "connect"); - return socket; - }); - vi.spyOn(CloudServerConnection.prototype, "ensureDocker").mockResolvedValue(); - vi.spyOn(CloudServerConnection.prototype, "publishedPorts").mockResolvedValue([]); - vi.spyOn(CloudWorkspaceExecutor.prototype, "exec").mockImplementation((command) => - exec(host.id, command), - ); - }); - afterAll(async () => { - if (!runtime) return; - for (const project of projects) { - for (const id of await runtime.listProjectContainerIds(project.id)) containers.add(id); - } - for (const id of containers) { - const container = runtime.docker.getContainer(id); - for (const mount of (await container.inspect()).Mounts) { - if (mount.Type === "volume" && mount.Name) volumes.add(mount.Name); - } - await container.remove({ force: true }); - } - for (const project of projects) await runtime.removeNetwork(project.slug); - for (const name of sharedNetworks) await runtime.docker.getNetwork(name).remove(); - for (const volume of (await runtime.docker.listVolumes()).Volumes ?? []) { - if (projects.some((project) => volume.Labels?.["openship.project"] === project.id)) - volumes.add(volume.Name); - } - for (const name of volumes) await runtime.docker.getVolume(name).remove(); - for (const image of images) await runtime.removeImage(image); - await runtime.dispose(); - vi.restoreAllMocks(); - }); - - async function start(image: string, volume: string, command: string[]) { - const container = await runtime.docker.createContainer({ - Image: image, - Cmd: command, - Labels: { "openship.test": tag }, - HostConfig: { Binds: [`${volume}:/data`] }, - }); - containers.add(container.id); - await container.start(); - return container.id; - } - - it.each([ - { transport: "socket", split: false }, - { transport: "cloud", split: false }, - { transport: "socket", split: true }, - { transport: "cloud", split: true }, - ] as const)( - "imports through $transport (multiple repositories: $split), isolating DNS, env and persisted data", - async ({ transport, split }) => { - const owner = await seedOrg({ ownsHost: true }); - const ctx = { - ...owner, - role: "owner", - user: { id: owner.userId, name: "Test", email: "test@example.test" }, - sessionKind: "cookie", - } as ExecutionContext; - const serverId = `${tag}-${transport}-${split}`; - await db.insert(schema.servers).values({ - id: serverId, - organizationId: owner.organizationId, - isLocal: true, - sshHost: "localhost", - sshUser: "root", - sshAuthMethod: "key", - }); - const openRuntime = () => - DockerRuntime.create( - transport === "socket" - ? { transport: "socket" } - : { - transport: "cloud", - // The real managed Docker transport, with only its provider tunnel - // replaced. Host execution must never be used for copying data. - cloudConnection: async () => { - const socket = createConnection(dockerSocketPath); - await once(socket, "connect"); - return socket; - }, - executor: { - exec: async () => { - throw new Error("Unexpected API-host execution"); - }, - dispose: async () => {}, - } as unknown as CommandExecutor, - }, - ); - h.runtime.mockImplementation(openRuntime); - h.prepare.mockImplementation(async (_run, plan) => { - for (const service of plan.services) { - const source = sources.get(service.source.id); - if (source) await runtime.docker.getContainer(source.container).stop({ t: 10 }); - } - }); - h.assertStopped.mockImplementation(async () => { - for (const source of sources.values()) { - expect( - (await runtime.docker.getContainer(source.container).inspect()).State.Running, - ).toBe(false); - } - }); - h.openSource.mockImplementation(async (_run, service) => { - const source = sources.get(service.id)!; - const channel = { - rawExec: async (command: string) => { - const child = spawn("docker", ["exec", source.exporter, "sh", "-c", command]); - return { - stdout: child.stdout, - stderr: child.stderr, - kill: () => { - child.kill("SIGKILL"); - }, - onClose: new Promise((resolve, reject) => { - child.once("error", reject); - child.once("close", (code) => resolve(code ?? 1)); - }), - }; - }, - } as CommandExecutor; - return { - executor: new CommandSourceBackupExecutor(channel, ["/data"]), - dispose: async () => {}, - }; - }); - h.deploy.mockImplementation(async (_ctx, input) => { - // This isolated daemon uses its private project networks; no edge or - // published host ports are needed for this container-IP routing fixture. - await repos.project.update(input.projectId, { routeStrategy: "container-ip" }); - const project = (await repos.project.findById(input.projectId))!; - const services = await repos.service.listByProject(project.id); - await refreshConnectionEnv(ctx, project.id); - const preparedLocalImages = new Map(); - const builtImages = new Map(); - for (const service of services) { - if (service.image) preparedLocalImages.set(service.id, service.image); - else { - // Stand in for the immutable Git checkout with a distinct build per - // repository/revision. The image build and deployment stay real. - const directory = await mkdtemp(join(tmpdir(), "openship-import-build-")); - const image = `${tag}:${service.id}`; - images.add(image); - try { - await writeFile( - join(directory, "Dockerfile"), - `FROM redis:7-alpine\nRUN echo '${project.gitRepo}:${input.commitSha}' > /source-revision\n`, - ); - const stream = await runtime.docker.buildImage( - { context: directory, src: ["Dockerfile"] }, - { t: image, networkmode: "none", labels: { "openship.project": project.id } }, - ); - await new Promise((resolve, reject) => - runtime.docker.modem.followProgress(stream, (error, output) => { - const failure = output?.find((event: { error?: string }) => event.error)?.error; - if (error || failure) reject(error ?? new Error(failure)); - else resolve(); - }), - ); - preparedLocalImages.set(service.id, image); - builtImages.set(service.id, image); - } finally { - await rm(directory, { recursive: true, force: true }); - } - } - } - const deployment = await seedDeployment(project, { - status: "deploying", - trigger: "manual", - imageRef: "compose", - containerId: "compose", - meta: { - runtimeMode: "docker", - deployTarget: "local", - composeServices: projectServicesToDeployableServices(services), - }, - }); - const target = - transport === "socket" - ? await openRuntime() - : await CloudDockerRuntime.forWorkspace( - { - vms: { - get: async () => ({ - id: serverId, - namespace: owner.organizationId, - status: "running", - }), - }, - } as unknown as Parameters[0], - { - workspaceId: serverId, - ownerWorkspaceId: serverId, - projectId: project.id, - namespace: owner.organizationId, - provisionLock: { run: (work) => work() }, - resolveRegistryAuth: async () => undefined, - }, - ); - try { - const result = await deployComposeServices( - project, - deployment, - target, - new BuildLogger(() => {}), - { - executor: null, - localHost: false, - preparedLocalImages, - builtImages, - targetServiceIds: new Set(input.serviceIds), - }, - ); - expect(result.status, JSON.stringify(result)).toBe("ready"); - await repos.deployment.updateStatus(deployment.id, "ready"); - await setActive(project.id, deployment.id); - await result.cutover?.commit(); - } finally { - await target.dispose(); - } - return { deployment }; - }); - - const imported: Array<{ id: string; marker: string }> = []; - for (const projectNumber of [1, 2]) { - const marker = `${tag}-${transport}-${split}-${projectNumber}`; - const services: ProviderInventory["services"] = []; - for (const name of ["db", "cache"]) { - const id = `${marker}-${name}`; - const volume = `${id}-source`; - await runtime.docker.createVolume({ Name: volume }); - volumes.add(volume); - const container = await start("redis:7-alpine", volume, [ - "redis-server", - "--appendonly", - "yes", - ]); - await expect - .poll(() => exec(container, "redis-cli PING"), { timeout: 10_000 }) - .toBe("PONG"); - await exec(container, `redis-cli SET marker '${marker}-${name}'`); - const exporter = await start("alpine:3", volume, ["sleep", "infinity"]); - sources.set(id, { container, exporter }); - services.push({ - id, - name, - kind: "database", - database: "redis_rdb", - image: "redis:7-alpine", - instanceId: container, - privateDomain: `${name}.railway.internal`, - port: 6379, - env: { SERVICE_SECRET: `${marker}-${name}` }, - rawEnv: {}, - variables: [], - volumes: [{ id: volume, mountPath: "/data" }], - domains: [], - warnings: [], - blockers: [], - startCommand: "redis-server --appendonly yes", - }); - } - services.push({ - id: `${marker}-worker`, - name: "worker", - kind: "worker", - image: "redis:7-alpine", - instanceId: "source-worker", - port: 8080, - env: { - SERVICE_SECRET: `${marker}-worker`, - PRIMARY_HOST: "db.railway.internal", - CACHE_HOST: "cache.railway.internal", - BOTH_HOSTS: "db.railway.internal,cache.railway.internal", - }, - rawEnv: {}, - variables: [], - volumes: [], - domains: [ - { hostname: `${marker}.example.com`, portable: true }, - { hostname: `www.${marker}.example.com`, portable: true }, - { hostname: `${marker}.up.railway.app`, portable: false }, - ], - warnings: [], - blockers: [], - startCommand: - "sh -c 'while true; do printf \"HTTP/1.1 200 OK\\r\\nContent-Length: 6\\r\\nConnection: close\\r\\n\\r\\nready\\n\" | nc -l -p 8080; done'", - }); - if (split) { - // Two distinct Git sources plus one image-backed database. All volumes - // must move before either destination Git service is allowed to start. - for (const name of ["cache", "worker"]) { - const source = services.find((service) => service.name === name)!; - source.image = undefined; - source.repository = `fixture/${name}`; - source.commit = (name === "cache" ? "a" : "b").repeat(40); - source.branch = "main"; - source.dockerfile = "Dockerfile"; - } - delete services.find((service) => service.name === "worker")!.env.BOTH_HOSTS; - } - const inventory: ProviderInventory = { - provider: "railway", - source: { connectionId: "fixture", projectId: marker, environmentId: "production" }, - projectName: marker, - environmentName: "Production", - services, - warnings: [], - }; - h.discover.mockImplementation(async () => structuredClone(inventory)); - const discovery = await discoverPlatform(ctx, inventory.source); - const review = await reviewPlatform(ctx, { - draftId: discovery.draftId, - targetServerId: serverId, - services: discovery.services.map((s) => ({ id: s.id, name: s.name, data: "copy" })), - }); - expect(review.ready, JSON.stringify(review)).toBe(true); - const plan = await loadReviewedImport(ctx, review.planId); - const runId = `${marker}-run`; - await repos.dockerMigrationRun.create({ - id: runId, - organizationId: owner.organizationId, - targetServerId: serverId, - projectName: marker, - mode: "provider_import", - status: "adopting", - inputSnapshot: { provider: "railway", source: inventory.source }, - recovery: { - providerImport: { - planId: plan.id, - planEnc: encrypt(JSON.stringify(plan)), - connectionId: "fixture", - projects: {}, - completed: [], - cleanupPending: true, - }, - }, - }); - try { - await executePlatformImport(ctx, runId, plan, { - signal: new AbortController().signal, - log: () => {}, - progress: () => {}, - phase: async () => {}, - wait: async (id) => (await repos.deployment.findById(id))?.status === "ready", - }); - } finally { - const saved = await repos.project.listByOrganization(owner.organizationId); - for (const p of saved.rows) { - if (!projects.some((known) => known.id === p.id)) projects.push(p); - for (const link of await repos.projectConnection.listByTarget(p.id)) - if (link.sourceServiceId) - sharedNetworks.add(sharedServiceNetwork(link.sourceServiceId)); - } - } - const checkpoint = (await repos.dockerMigrationRun.findById(runId))!.recovery - .providerImport!; - const ids = [...new Set(Object.values(checkpoint.projects))]; - expect(ids).toHaveLength(split ? 3 : 1); - expect(checkpoint.completed).toHaveLength(3); - expect((await repos.project.listByOrganization(owner.organizationId)).total).toBe( - projectNumber * (split ? 3 : 1), - ); - for (const id of ids) { - expect(await repos.service.listByProject(id)).toHaveLength(split ? 1 : 3); - if (!split) expect(await repos.project.getEnvMap(id, "production", null)).toEqual({}); - imported.push({ id, marker }); - } - } - - // Check both projects AFTER the second import: duplicate service names - // must not redirect the first project's DNS or overwrite its storage. - for (const { id, marker } of imported) { - const project = (await repos.project.findById(id))!; - const rows = await repos.service.listByProject(id); - const deployed = await repos.service.listByDeployment(project.activeDeploymentId!); - for (const service of rows) { - const env = decryptEnvMap(await repos.project.getEnvMap(id, "production", service.id)); - expect(env.SERVICE_SECRET).toBe(`${marker}-${service.name}`); - const container = deployed.find((r) => r.serviceId === service.id)!.containerId!; - expect(await exec(container, 'printf %s "$SERVICE_SECRET"')).toBe(env.SERVICE_SECRET); - if (split && project.gitRepo) { - const revision = (service.name === "cache" ? "a" : "b").repeat(40); - expect(await exec(container, "cat /source-revision")).toBe( - `${project.gitRepo}:${revision}`, - ); - } - if (service.name === "worker") { - expect(service.exposed).toBe(true); - expect(service.publicEndpoints).toEqual([ - expect.objectContaining({ port: 8080, customDomain: `${marker}.example.com` }), - ]); - const domains = await repos.domain.listByProject(id); - expect(domains.map((domain) => domain.hostname).sort()).toEqual( - [`${marker}.example.com`, `www.${marker}.example.com`].sort(), - ); - expect( - domains.every( - (domain) => - domain.serviceId === service.id && domain.targetPort === 8080 && !domain.verified, - ), - ).toBe(true); - expect(await exec(container, "wget -qO- http://127.0.0.1:8080")).toBe("ready"); - if (!split) expect(await exec(container, 'printf %s "$BOTH_HOSTS"')).toBe("db,cache"); - else { - const links = await repos.projectConnection.listByTarget(id); - expect(links).toHaveLength(2); - expect( - links.every( - (link) => - link.organizationId === owner.organizationId && - link.mode === "internal" && - link.usesPrivateNetwork, - ), - ).toBe(true); - for (const link of links) { - expect(env[link.envKey]).toBeUndefined(); // Service env must not shadow its native link. - expect(await exec(container, `printenv ${link.envKey}`)).toBe( - sharedServiceAlias(link.sourceServiceId!), - ); - } - } - expect(await exec(container, 'redis-cli -h "$PRIMARY_HOST" GET marker')).toBe( - `${marker}-db`, - ); - expect(await exec(container, 'redis-cli -h "$CACHE_HOST" GET marker')).toBe( - `${marker}-cache`, - ); - if (split) { - // An ordinary later deployment refreshes the same saved links and - // rejoins the private networks without the import worker involved. - await h.deploy(ctx, { - projectId: id, - serviceIds: [service.id], - commitSha: "b".repeat(40), - }); - const current = (await repos.project.findById(id))!; - const next = (await repos.service.listByDeployment(current.activeDeploymentId!)).find( - (row) => row.serviceId === service.id, - )!; - expect(await exec(next.containerId!, 'redis-cli -h "$PRIMARY_HOST" GET marker')).toBe( - `${marker}-db`, - ); - expect(await exec(next.containerId!, 'redis-cli -h "$CACHE_HOST" GET marker')).toBe( - `${marker}-cache`, - ); - } - } else { - expect(await exec(container, "redis-cli GET marker")).toBe(`${marker}-${service.name}`); - await exec(container, "redis-cli SET new-write survives"); - await runtime.docker.getContainer(container).restart({ t: 10 }); - await expect - .poll(() => exec(container, "redis-cli GET marker"), { timeout: 10_000 }) - .toBe(`${marker}-${service.name}`); - expect(await exec(container, "redis-cli GET new-write")).toBe("survives"); - } - } - } - }, - ); -}); diff --git a/apps/api/test/e2e/routing-rules.e2e.test.ts b/apps/api/test/e2e/routing-rules.e2e.test.ts index 5bb132807..847467e33 100644 --- a/apps/api/test/e2e/routing-rules.e2e.test.ts +++ b/apps/api/test/e2e/routing-rules.e2e.test.ts @@ -1013,9 +1013,8 @@ http { pathPrefix?: string | null; } >, - targetPort = port, ): Promise { - const response = await ask(targetPort, "/rules", "management.test", { + const response = await ask(port, "/rules", "management.test", { method: "POST", body: JSON.stringify({ host, rules }), }); @@ -1073,29 +1072,25 @@ http { }); it("still publishes policies while a worker has the previous rules library loaded", async () => { - // Earlier route-update tests gracefully reload the shared edge. Their old - // and new workers can briefly overlap, so a worker-local library mutation - // must use a fresh edge whose single worker is stable across these requests. - const legacyPort = await bootAll(); await pushRules("rules.test", [ { pathPrefix: null, spec: { access: { methods: ["GET"] } } }, { pathPrefix: "/virtual", spec: { response: normalizeEdgeResponse({ body: "new worker response" }) }, }, - ], legacyPort); - await ask(legacyPort, "/response-legacy-worker", "management.test", { method: "POST" }); + ]); + await ask(port, "/response-legacy-worker", "management.test", { method: "POST" }); try { // A new worker may already have published a response into shared memory. // This worker must still enforce its policies and serve ordinary traffic. - const ordinary = await ask(legacyPort, "/virtual", "rules.test"); + const ordinary = await ask(port, "/virtual", "rules.test"); expect(ordinary.status).toBe(200); expect(ordinary.body).not.toBe("new worker response"); - expect((await ask(legacyPort, "/virtual", "rules.test", { method: "POST" })).status).toBe(403); - await pushRules("rules.test", [{ pathPrefix: null, spec: { access: { methods: ["GET"] } } }], legacyPort); - const capability = await ask(legacyPort, "/rules/capabilities", "management.test"); + expect((await ask(port, "/virtual", "rules.test", { method: "POST" })).status).toBe(403); + await pushRules("rules.test", [{ pathPrefix: null, spec: { access: { methods: ["GET"] } } }]); + const capability = await ask(port, "/rules/capabilities", "management.test"); expect(JSON.parse(capability.body).staticResponses).toBe(false); - const response = await ask(legacyPort, "/rules", "management.test", { + const response = await ask(port, "/rules", "management.test", { method: "POST", body: JSON.stringify({ host: "rules.test", @@ -1108,9 +1103,9 @@ http { }), }); expect(response.status).toBe(409); - expect((await ask(legacyPort, "/virtual", "rules.test", { method: "POST" })).status).toBe(403); + expect((await ask(port, "/virtual", "rules.test", { method: "POST" })).status).toBe(403); } finally { - await ask(legacyPort, "/response-legacy-worker", "management.test", { method: "DELETE" }); + await ask(port, "/response-legacy-worker", "management.test", { method: "DELETE" }); } }); diff --git a/apps/api/test/e2e/scaling-databases.e2e.test.ts b/apps/api/test/e2e/scaling-databases.e2e.test.ts index b86e1fcfd..fe5b603f9 100644 --- a/apps/api/test/e2e/scaling-databases.e2e.test.ts +++ b/apps/api/test/e2e/scaling-databases.e2e.test.ts @@ -15,7 +15,6 @@ import { type KubernetesObject, } from "@repo/adapters"; import type { ClusterRuntimePlan, ClusterDatabaseConfig } from "@repo/core"; -import { SecretValues } from "@repo/core/diagnostics"; import type { ClusterDatabase } from "@repo/contracts"; import { DATABASE_IMAGES, @@ -442,32 +441,8 @@ done afterEach(async (context) => { console.info(`[database-e2e] ${context.task.result?.state}: ${context.task.name}`); - if (context.task.result?.state !== "fail") return; - console.error(await lab.diagnostics()); - // Pod readiness alone cannot explain an operator stalled during a resize. - // Keep its status and reconciliation errors, with the lab's secrets masked. - try { - const secrets = await lab.api.request<{ items: KubernetesObject[] }>( - "GET", - `/api/v1/secrets?labelSelector=${encodeURIComponent(`openship.io/runtime=${lab.runtimeId}`)}`, - ); - const redactor = new SecretValues( - secrets.items.flatMap((secret) => - Object.values(secret.data ?? {}).map((value) => - Buffer.from(String(value), "base64").toString(), - ), - ), - ); - for (const args of [ - ["get", "redisclusters", "-A", "-o", "yaml"], - ["logs", "-n", "ot-operators", "deployment/redis-operator", "--tail=200"], - ]) { - console.error(redactor.redact(await lab.nodeExec(0, ["kubectl", ...args]))); - } - } catch (error) { - console.error("Database operator diagnostics unavailable:", String(error)); - } - }, 180000); + if (context.task.result?.state === "fail") console.error(await lab.diagnostics()); + }); afterAll(async () => { for (const index of paused) await resume(index).catch(() => {}); const { stopNetworkSetups } = diff --git a/apps/api/test/fixtures/oblien-capacity-catalog.json b/apps/api/test/fixtures/oblien-capacity-catalog.json index 78cf91b65..1e937f0cf 100644 --- a/apps/api/test/fixtures/oblien-capacity-catalog.json +++ b/apps/api/test/fixtures/oblien-capacity-catalog.json @@ -56,12 +56,12 @@ "vcpus": 0.5, "memoryMb": 512, "diskGb": 10, - "vms": 4 + "workspaces": 4 }, "monthlyAmount": 500, "paygCapAmount": 625, "resourceLimits": { - "max_vms": 4, + "max_workspaces": 4, "max_vcpus": 1, "max_ram_mb": 512, "max_disk_gb": 10, @@ -76,12 +76,12 @@ "vcpus": 1, "memoryMb": 1024, "diskGb": 20, - "vms": 8 + "workspaces": 8 }, "monthlyAmount": 800, "paygCapAmount": 1000, "resourceLimits": { - "max_vms": 8, + "max_workspaces": 8, "max_vcpus": 1, "max_ram_mb": 1024, "max_disk_gb": 20, @@ -96,12 +96,12 @@ "vcpus": 2, "memoryMb": 4096, "diskGb": 40, - "vms": 12 + "workspaces": 12 }, "monthlyAmount": 1800, "paygCapAmount": 2250, "resourceLimits": { - "max_vms": 12, + "max_workspaces": 12, "max_vcpus": 2, "max_ram_mb": 4096, "max_disk_gb": 40, @@ -116,12 +116,12 @@ "vcpus": 4, "memoryMb": 8192, "diskGb": 80, - "vms": 24 + "workspaces": 24 }, "monthlyAmount": 3600, "paygCapAmount": 4500, "resourceLimits": { - "max_vms": 24, + "max_workspaces": 24, "max_vcpus": 4, "max_ram_mb": 8192, "max_disk_gb": 80, diff --git a/apps/api/test/fixtures/upgrade/compose-0.9.11.yml b/apps/api/test/fixtures/upgrade/compose-0.9.11.yml deleted file mode 100644 index d9da40163..000000000 --- a/apps/api/test/fixtures/upgrade/compose-0.9.11.yml +++ /dev/null @@ -1,153 +0,0 @@ -# Frozen CLI template from v0.9.11:apps/cli/src/lib/compose.ts. -# Only test isolation (paths, images and container name) is applied at runtime. -# Managed by `openship up` — do not edit; re-run `openship up` to regenerate. -x-logging: &default-logging - driver: "json-file" - options: - max-size: "20m" - max-file: "3" - -services: - postgres: - image: postgres:16-alpine - restart: unless-stopped - logging: *default-logging - environment: - # Keep the data dir in a subdirectory of the volume so a fresh install never - # runs initdb against a bare mount root (which fails on quirky host - # filesystems with EPERM — #350). OPENSHIP_PGDATA is decided ONCE at install - # by the CLI (fresh → subdir, pre-existing volume → root) and preserved in - # .env, so this never moves an existing database. - PGDATA: ${OPENSHIP_PGDATA:-/var/lib/postgresql/data/pgdata} - POSTGRES_USER: ${POSTGRES_USER:-openship} - POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?missing from .env — re-run openship up to regenerate it} - POSTGRES_DB: ${POSTGRES_DB:-openship} - expose: ["5432"] - volumes: [postgres_data:/var/lib/postgresql/data] - healthcheck: - test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-openship} -d ${POSTGRES_DB:-openship}"] - interval: 5s - timeout: 3s - retries: 12 - - redis: - image: redis:7-alpine - restart: unless-stopped - logging: *default-logging - command: ["redis-server", "--appendonly", "yes"] - expose: ["6379"] - volumes: [redis_data:/data] - healthcheck: - test: ["CMD", "redis-cli", "ping"] - interval: 5s - timeout: 3s - retries: 12 - - api: - image: ${OPENSHIP_IMAGE_REGISTRY:-ghcr.io/oblien}/openship-api:${OPENSHIP_VERSION:-latest} - restart: unless-stopped - logging: *default-logging - # Loopback by default — the host-net edge reaches it over loopback, so nothing - # sits on a public interface. OPENSHIP_BIND_ADDR opts into a public/LAN interface - # (set by `openship up` when a public URL is configured for off-box access). - ports: ["${OPENSHIP_BIND_ADDR:-127.0.0.1}:${API_PORT:-4000}:${API_PORT:-4000}"] - volumes: - # The daemon socket, at the path the api's own default expects INSIDE the - # container. The HOST side is a variable because it MOVES: a rootless daemon - # keeps its socket under the invoking user's runtime dir, and Docker creates a - # missing bind source as an empty DIRECTORY instead of failing — so the rootful - # path there brings the stack up and then fails every container operation in - # the transport, naming neither the path nor the cause (#482). `openship up` - # writes OPENSHIP_DOCKER_SOCKET when the detected path isn't this default. - - ${OPENSHIP_DOCKER_SOCKET:-/var/run/docker.sock}:/var/run/docker.sock - # Registry credentials for private-image pulls. The API talks to the daemon over - # the socket above via dockerode, which — unlike the docker CLI — reads no - # config.json of its own, so a private pull went out anonymous on a logged-in - # host (#581). Mounted READ-ONLY and only into this service; absent entirely when - # the host has no config, so nothing is invented. Substituted at write time (the - # path depends on DOCKER_CONFIG and on the file existing), hence the marker. - # Routing state shared with the edge, as HOST BIND MOUNTS (generated from - # EDGE_CONTAINER_MOUNTS): the vhost tree, /etc/letsencrypt, the ACME webroot - # and the static doc-roots the API writes and the edge serves. Named volumes - # hid all of it from every host-side reader (migrate's proxy scan, cert carry, - # cert reuse, mail cert symlinks), each of which then silently saw "nothing". - - /private/var/lib/openship/edge/sites-enabled:/usr/local/openresty/nginx/conf/sites-enabled:z - - /private/etc/letsencrypt:/etc/letsencrypt:z - - /private/var/lib/openship/edge/acme:/var/www/acme:z - - /opt/openship/static:/opt/openship/static:z - # Host-op SSH key (createHostExecutor → host.docker.internal). /dev/null - # when the host channel isn't provisioned → OPENSHIP_HOST_SSH_HOST stays - # unset, and host operations REFUSE (they'd otherwise run against this - # container's filesystem, #509) while ordinary deploys keep working over - # the socket below. - - ${OPENSHIP_HOST_KEY_PATH:-/dev/null}:/run/secrets/openship_host_key:ro - # `host-gateway` is resolved by the daemon and is right on a stock rootful - # install. It is NOT universally right: under rootless Docker it lands in - # RootlessKit's namespace rather than the host's, so the host's sshd isn't - # there (#482). OPENSHIP_HOST_GATEWAY re-points the alias (e.g. at the box's - # LAN address) without patching this file, which `openship up` rewrites. - extra_hosts: ["host.docker.internal:${OPENSHIP_HOST_GATEWAY:-host-gateway}"] - env_file: [.env] - environment: - NODE_ENV: production - PORT: "${API_PORT:-4000}" - DATABASE_URL: postgresql://${POSTGRES_USER:-openship}:${POSTGRES_PASSWORD:?missing from .env — re-run openship up to regenerate it}@postgres:5432/${POSTGRES_DB:-openship} - REDIS_URL: redis://redis:6379 - OPENSHIP_EDGE_MODE: docker - OPENSHIP_EDGE_CONTAINER: openship-edge - depends_on: - postgres: { condition: service_healthy } - redis: { condition: service_healthy } - healthcheck: - test: ["CMD-SHELL", "node -e \"fetch('http://127.0.0.1:${API_PORT:-4000}/api/health').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))\""] - interval: 10s - timeout: 5s - retries: 12 - start_period: 40s - - dashboard: - image: ${OPENSHIP_IMAGE_REGISTRY:-ghcr.io/oblien}/openship-dashboard:${OPENSHIP_VERSION:-latest} - restart: unless-stopped - logging: *default-logging - # Loopback by default (see api note); OPENSHIP_BIND_ADDR opts into a public interface. - ports: ["${OPENSHIP_BIND_ADDR:-127.0.0.1}:${DASHBOARD_PORT:-3001}:${DASHBOARD_PORT:-3001}"] - env_file: [.env] - environment: - NODE_ENV: production - PORT: "${DASHBOARD_PORT:-3001}" - HOSTNAME: "0.0.0.0" - INTERNAL_API_URL: http://api:${API_PORT:-4000} - depends_on: - api: { condition: service_healthy } - healthcheck: - test: ["CMD", "node", "-e", "fetch('http://127.0.0.1:'+process.env.PORT+'/',{redirect:'manual'}).then(r=>process.exit(r.status<500?0:1)).catch(()=>process.exit(1))"] - interval: 5s - timeout: 5s - retries: 24 - start_period: 20s - - edge: - image: ${OPENSHIP_IMAGE_REGISTRY:-ghcr.io/oblien}/openship-edge:${OPENSHIP_VERSION:-latest} - # PINNED, and it must stay pinned: the api reaches the edge by NAME through - # DockerEdgeExecutor (OPENSHIP_EDGE_CONTAINER above), and "ours" edge - # detection greps `docker ps --filter name=openship-edge`. Without this, - # compose derives `-edge-1` from the directory and every - # `docker exec` into the edge fails with "No such container: openship-edge" — - # which silently migrated 0 sites after the operator's proxy was stopped. - # Safe here: the edge is a singleton (host networking, one per box). - container_name: openship-edge - restart: unless-stopped - logging: *default-logging - network_mode: host - depends_on: - api: { condition: service_healthy } - dashboard: { condition: service_healthy } - volumes: - - /private/var/lib/openship/edge/sites-enabled:/usr/local/openresty/nginx/conf/sites-enabled:z - - /private/etc/letsencrypt:/etc/letsencrypt:z - - /private/var/lib/openship/edge/acme:/var/www/acme:z - - /opt/openship/static:/opt/openship/static:z - -volumes: - postgres_data: - redis_data: diff --git a/apps/api/test/helpers/monthly-cloud-offer.ts b/apps/api/test/helpers/monthly-cloud-offer.ts index e55e44596..b95c4cb7c 100644 --- a/apps/api/test/helpers/monthly-cloud-offer.ts +++ b/apps/api/test/helpers/monthly-cloud-offer.ts @@ -1,6 +1,6 @@ import type { OblienEntitlement, OblienSubscription } from "@repo/platform/engine/lib/oblien-billing-api"; -/** OpenShip saved v9 terms, independent of today's catalog and provider wire names. */ +/** Saved v9 terms and the SDK 2.8 capacity shape, independent of today's catalog. */ export function monthlyCloudBilling(organizationId = "org_1", namespace = "os-customer") { const periodStart = "2026-10-01T00:00:00Z"; const periodEnd = "2026-11-01T00:00:00Z"; diff --git a/apps/api/test/helpers/oblien-vm-billing.ts b/apps/api/test/helpers/oblien-vm-billing.ts deleted file mode 100644 index 9f8ea75f9..000000000 --- a/apps/api/test/helpers/oblien-vm-billing.ts +++ /dev/null @@ -1,40 +0,0 @@ -/** Build provider HTTP fixtures from OpenShip's saved billing model. This helper - * is only for fixture construction; production must read native SDK 3 payloads. - * Customer metadata and other opaque dictionaries are deliberately untouched. */ -export function providerBillingFixture(value: unknown): unknown { - if (!value || typeof value !== "object" || Array.isArray(value)) return value; - const source = value as Record; - const native = { ...source }; - if ("vcpus" in source && "memoryMb" in source && "diskGb" in source && "workspaces" in source) { - native.vms = source.workspaces; - delete native.workspaces; - } - if (source.resourceLimits && typeof source.resourceLimits === "object") { - const limits = { ...(source.resourceLimits as Record) }; - if ("max_workspaces" in limits) { - limits.max_vms = limits.max_workspaces; - delete limits.max_workspaces; - } - native.resourceLimits = limits; - } - if (source.onOverdraftAction === "stop_workspaces") native.onOverdraftAction = "stop_vms"; - if (source.service === "workspace_vm") native.service = "vm_compute"; - for (const key of [ - "data", - "capacity", - "quote", - "current", - "next", - "subscription", - "offer", - "policy", - "pendingChange", - "change", - "pendingCheckout", - "checkout", - ]) - if (source[key] && typeof source[key] === "object") - native[key] = providerBillingFixture(source[key]); - if (Array.isArray(source.presets)) native.presets = source.presets.map(providerBillingFixture); - return native; -} diff --git a/apps/api/test/lib/cloud-capacity.test.ts b/apps/api/test/lib/cloud-capacity.test.ts index 621c3145c..4be698883 100644 --- a/apps/api/test/lib/cloud-capacity.test.ts +++ b/apps/api/test/lib/cloud-capacity.test.ts @@ -20,7 +20,7 @@ vi.mock("@repo/db", () => ({ })); vi.mock("@repo/platform/engine/lib/oblien-client", () => ({ getOblienClient: () => ({ - vms: { get: h.workspace }, + workspaces: { get: h.workspace }, namespaces: { get: h.namespace }, }), })); diff --git a/apps/api/test/lib/cloud-docker-workspace.test.ts b/apps/api/test/lib/cloud-docker-workspace.test.ts index 9e4d1f18b..b2c2cf0cf 100644 --- a/apps/api/test/lib/cloud-docker-workspace.test.ts +++ b/apps/api/test/lib/cloud-docker-workspace.test.ts @@ -30,8 +30,8 @@ vi.mock("@repo/adapters", async (original) => ({ ...await original(), Oblien: class { constructor(credentials: unknown) { h.credentials.push(credentials); } - vms = { create: h.create, retryCreation: h.retry, get: h.get, list: h.list }; - vm = (id: string) => ({ id, get: h.get, start: h.start, resume: h.resume, + workspaces = { create: h.create, retryCreation: h.retry, get: h.get, list: h.list }; + workspace = (id: string) => ({ id, get: h.get, start: h.start, resume: h.resume, lifecycle: { makePermanent: h.permanent }, resources: { update: h.resize }, runtime: async () => ({ exec: { run: h.exec } }), invalidateRuntime: h.invalidate }); }, @@ -86,7 +86,7 @@ beforeEach(() => { return { success: true, relaunched: true }; }); h.inFlight.mockResolvedValue([]); - h.list.mockResolvedValue({ vms: [], total: 0, limit: 100, page: 1 }); + h.list.mockResolvedValue({ workspaces: [], total: 0, limit: 100, page: 1 }); h.discard.mockImplementation(async () => { binding = undefined; }); @@ -190,7 +190,7 @@ describe("Subscribed Cloud server provisioning and retry", () => { it("adopts an earlier workspace discovered after a quota refusal instead of creating another", async () => { binding = { ...input, namespace: "namespace-a", provisionKey: "legacy-key", workspaceId: null, state: "provisioning" }; h.create.mockRejectedValue(Object.assign(new Error("namespace workspace limit"), { status: 409, code: "NAMESPACE_LIMIT_REACHED" })); - h.list.mockResolvedValue({ vms: [await h.get()], total: 1, limit: 100, page: 1 }); + h.list.mockResolvedValue({ workspaces: [await h.get()], total: 1, limit: 100, page: 1 }); await expect(ensureCloudDockerWorkspace(input)).resolves.toEqual({ projectId: project.id, workspaceId: "workspace-a", ownerWorkspaceId: "owner-a" }); expect(h.create).toHaveBeenCalledOnce(); expect(h.discard).not.toHaveBeenCalled(); @@ -209,8 +209,8 @@ describe("Subscribed Cloud server provisioning and retry", () => { binding = { ...input, namespace: "namespace-a", provisionKey: "legacy-key", workspaceId: null, state: "provisioning" }; h.create.mockRejectedValue(Object.assign(new Error("namespace workspace limit"), { status: 409, code: "NAMESPACE_LIMIT_REACHED" })); const workspace = await h.get(); - h.list.mockResolvedValueOnce({ vms: [{ ...workspace, namespace: "other-namespace", id: "foreign-vm" }], total: 2, limit: 1, page: 1 }); - h.list.mockResolvedValueOnce({ vms: [workspace], total: 2, limit: 1, page: 2 }); + h.list.mockResolvedValueOnce({ workspaces: [{ ...workspace, namespace: "other-namespace", id: "foreign-vm" }], total: 2, limit: 1, page: 1 }); + h.list.mockResolvedValueOnce({ workspaces: [workspace], total: 2, limit: 1, page: 2 }); await expect(ensureCloudDockerWorkspace(input)).resolves.toMatchObject({ workspaceId: "workspace-a" }); expect(h.list).toHaveBeenNthCalledWith(2, { page: 2, limit: 100 }); expect(h.attach).toHaveBeenCalledExactlyOnceWith(ownerRef, project.organizationId, "namespace-a", "workspace-a"); @@ -219,7 +219,7 @@ describe("Subscribed Cloud server provisioning and retry", () => { binding = { ...input, namespace: "namespace-a", provisionKey: "legacy-key", workspaceId: null, state: "provisioning" }; h.create.mockRejectedValue(Object.assign(new Error("namespace workspace limit"), { status: 409, code: "NAMESPACE_LIMIT_REACHED" })); const workspace = await h.get(); - h.list.mockResolvedValue({ vms: [workspace, { ...workspace, id: "duplicate-vm" }], total: 2, limit: 100, page: 1 }); + h.list.mockResolvedValue({ workspaces: [workspace, { ...workspace, id: "duplicate-vm" }], total: 2, limit: 100, page: 1 }); await expect(ensureCloudDockerWorkspace(input)).rejects.toThrow("Multiple Cloud servers"); expect(h.attach).not.toHaveBeenCalled(); expect(h.discard).not.toHaveBeenCalled(); @@ -288,7 +288,7 @@ describe("Subscribed Cloud server provisioning and retry", () => { const error = Object.assign(new Error("initial provisioning failed"), { status: 422, code: "CREATE_FAILED", - details: { vm_id: "workspace-a" }, + details: { workspace_id: "workspace-a" }, }); h.create.mockRejectedValueOnce(error); await expect(ensureCloudDockerWorkspace(input)).rejects.toBe(error); @@ -328,7 +328,7 @@ describe("Subscribed Cloud server provisioning and retry", () => { h.create.mockRejectedValueOnce( Object.assign(new Error("creation failed"), { status: 422, - details: { vm_id: "workspace-a" }, + details: { workspace_id: "workspace-a" }, }), ); const created = await h.get(); diff --git a/apps/api/test/lib/cloud-namespace-token-reuse.test.ts b/apps/api/test/lib/cloud-namespace-token-reuse.test.ts index f5623dd04..c27c36e3b 100644 --- a/apps/api/test/lib/cloud-namespace-token-reuse.test.ts +++ b/apps/api/test/lib/cloud-namespace-token-reuse.test.ts @@ -98,7 +98,7 @@ it("renews expiring credentials once across concurrent clients", async () => { ]); vi.setSystemTime(Date.now() + 1741_000); await Promise.all( - clients.map(({ client }) => client._http.request({ method: "GET", path: "/vms" })), + clients.map(({ client }) => client._http.request({ method: "GET", path: "/workspace" })), ); expect(h.mint).toHaveBeenCalledTimes(2); expect(fetcher.mock.calls).toHaveLength(2); @@ -111,12 +111,12 @@ it("evicts rejected credentials without replaying a mutation", async () => { .mockImplementation(async () => Response.json({ success: true })); vi.stubGlobal("fetch", fetcher); const { client } = await getNamespaceClient("org", "space"); - await expect(client._http.request({ method: "POST", path: "/vms" })).rejects.toMatchObject({ + await expect(client._http.request({ method: "POST", path: "/workspace" })).rejects.toMatchObject({ status: 401, }); expect(fetcher).toHaveBeenCalledTimes(1); const next = await getNamespaceClient("org", "space"); - await next.client._http.request({ method: "GET", path: "/vms" }); + await next.client._http.request({ method: "GET", path: "/workspace" }); expect(h.mint).toHaveBeenCalledTimes(2); expect(new Headers(fetcher.mock.calls[1]![1].headers).get("authorization")).toBe( "Bearer token-2", @@ -171,9 +171,9 @@ it("does not evict a renewed token when an older request returns a late 401", as .mockImplementation(async () => Response.json({ success: true })); vi.stubGlobal("fetch", fetcher); const { client } = await getNamespaceClient("org", "space"); - const old = client._http.request({ method: "POST", path: "/vms" }).catch((error) => error); + const old = client._http.request({ method: "POST", path: "/workspace" }).catch((error) => error); vi.setSystemTime(Date.now() + 1741_000); - await client._http.request({ method: "GET", path: "/vms" }); + await client._http.request({ method: "GET", path: "/workspace" }); rejectOld(Response.json({ code: "token_revoked" }, { status: 401 })); expect(await old).toMatchObject({ status: 401 }); await getNamespaceClient("org", "space"); diff --git a/apps/api/test/lib/cloud-preflight.test.ts b/apps/api/test/lib/cloud-preflight.test.ts index 2051f666a..e419c3712 100644 --- a/apps/api/test/lib/cloud-preflight.test.ts +++ b/apps/api/test/lib/cloud-preflight.test.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it, vi } from "vitest"; const h = vi.hoisted(() => ({ token: vi.fn(), routes: vi.fn(), checkSlug: vi.fn(), verify: vi.fn(), scopedVerify: vi.fn(), spend: vi.fn(), createPlatform: vi.fn(), quota: vi.fn() })); -vi.mock("@repo/adapters", async original => ({ ...await original(), createPlatform: h.createPlatform })); +vi.mock("@repo/adapters", () => ({ createPlatform: h.createPlatform })); vi.mock("@repo/platform/engine/config/env", () => ({ env: { OBLIEN_API_URL: "https://api.oblien.com" } })); vi.mock("@repo/platform/engine/lib/routing-domains", () => ({ getRoutingBaseDomain: () => "opsh.io" })); vi.mock("@repo/platform/engine/lib/openship-cloud", () => ({ diff --git a/apps/api/test/lib/cloud-resource-limits.test.ts b/apps/api/test/lib/cloud-resource-limits.test.ts index 69433a654..a25adc3c9 100644 --- a/apps/api/test/lib/cloud-resource-limits.test.ts +++ b/apps/api/test/lib/cloud-resource-limits.test.ts @@ -2,9 +2,8 @@ import { beforeEach, describe, expect, it, vi } from "vitest"; const h = vi.hoisted(() => ({ quota: vi.fn(), get: vi.fn(), update: vi.fn() })); vi.mock("@repo/platform/engine/lib/oblien-client", () => ({ - getOblienClient: () => ({ vms: { getQuota: h.quota }, namespaces: { get: h.get, update: h.update } }), + getOblienClient: () => ({ workspaces: { getQuota: h.quota }, namespaces: { get: h.get, update: h.update } }), })); -import { toOblienVmLimits } from "@repo/adapters"; import { cloudNamespaceLimits, initialCloudNamespaceLimits, readCloudCapacity, readCloudCapacityPool, syncCloudResourceLimits } from "@repo/platform/engine/lib/cloud-resource-limits"; beforeEach(() => { @@ -12,15 +11,15 @@ beforeEach(() => { h.quota.mockImplementation(() => { throw new Error("Openship must not calculate provider capacity"); }); h.get.mockResolvedValue({ data: { id: "ns-a", slug: "tenant-a", resource_limits: null } }); h.update.mockImplementation(async (_id, input) => ({ data: { id: "ns-a", slug: "tenant-a", ...input, - effective_resource_limits: { max_vms: 52, max_vcpus: 32, max_ram_mb: 65536, max_disk_gb: 1024 }, + effective_resource_limits: { max_workspaces: 52, max_vcpus: 32, max_ram_mb: 65536, max_disk_gb: 1024 }, } })); }); describe("Oblien-owned namespace capacity", () => { it("displays provider allocations in their real units without using credit balances or owner limits", async () => { h.get.mockResolvedValue({ success: true, data: { slug: "tenant-a", - effective_resource_limits: toOblienVmLimits(cloudNamespaceLimits("pro")), - allocated_resource_usage: { vms: 3, vcpus: 2.5, ram_mb: 4096, disk_gb: 48.5, pending_updates: 1 }, + effective_resource_limits: cloudNamespaceLimits("pro"), + allocated_resource_usage: { workspaces: 3, vcpus: 2.5, ram_mb: 4096, disk_gb: 48.5, pending_updates: 1 }, } }); expect(await readCloudCapacity("tenant-a")).toEqual({ workspaces: { used: 3, max: 1 }, vcpus: { used: 2.5, max: 4 }, ramMb: { used: 4096, max: 16384 }, diskGb: { used: 48.5, max: 250 } }); @@ -37,8 +36,8 @@ describe("Oblien-owned namespace capacity", () => { }); it("converts disk to MB for admission without confusing zero and unlimited", async () => { h.get.mockResolvedValue({ success: true, data: { slug: "tenant-a", - effective_resource_limits: { max_vms: null, max_total_vcpus: 0, max_total_ram_mb: 8192, max_total_disk_gb: 16 }, - allocated_resource_usage: { vms: 0, vcpus: 0, ram_mb: 0, disk_gb: 1.25, pending_updates: 0 }, + effective_resource_limits: { max_workspaces: null, max_total_vcpus: 0, max_total_ram_mb: 8192, max_total_disk_gb: 16 }, + allocated_resource_usage: { workspaces: 0, vcpus: 0, ram_mb: 0, disk_gb: 1.25, pending_updates: 0 }, } }); expect(await readCloudCapacityPool("tenant-a")).toEqual({ workspaces: { used: 0, max: null }, cpuCores: { used: 0, max: 0 }, memoryMb: { used: 0, max: 8192 }, diskMb: { used: 1280, max: 16384 } }); @@ -51,37 +50,37 @@ describe("Oblien-owned namespace capacity", () => { }); it("declares finite retail VM and aggregate caps without reading enterprise owner capacity", async () => { expect(cloudNamespaceLimits("team")).toEqual({ max_workspaces: 1, max_vcpus: 8, max_ram_mb: 32768, max_disk_gb: 600, max_total_vcpus: 8, max_total_ram_mb: 32768, max_total_disk_gb: 600 }); - await expect(initialCloudNamespaceLimits()).resolves.toEqual({ max_vms: 0, max_vcpus: 1, max_ram_mb: 1024, max_disk_gb: 8, max_total_vcpus: 0, max_total_ram_mb: 0, max_total_disk_gb: 0 }); + await expect(initialCloudNamespaceLimits()).resolves.toEqual({ max_workspaces: 0, max_vcpus: 1, max_ram_mb: 1024, max_disk_gb: 8, max_total_vcpus: 0, max_total_ram_mb: 0, max_total_disk_gb: 0 }); await syncCloudResourceLimits("tenant-a", "team"); - expect(h.update).toHaveBeenCalledWith("ns-a", { resource_limits: toOblienVmLimits(cloudNamespaceLimits("team")) }); + expect(h.update).toHaveBeenCalledWith("ns-a", { resource_limits: cloudNamespaceLimits("team") }); expect(h.quota).not.toHaveBeenCalled(); }); - it("preserves an older saved offer when sending VM limits and accepts Oblien's lower effective ceiling", async () => { + it("sends an older saved offer unchanged and accepts Oblien's lower effective ceiling", async () => { const saved = Object.freeze({ max_workspaces: 52, max_vcpus: 200, max_ram_mb: 417792, max_disk_gb: 64, max_total_vcpus: 8, max_total_ram_mb: 16384, max_total_disk_gb: 256 }); await syncCloudResourceLimits("tenant-a", "team", saved); - expect(h.update).toHaveBeenCalledWith("ns-a", { resource_limits: toOblienVmLimits(saved) }); + expect(h.update).toHaveBeenCalledWith("ns-a", { resource_limits: saved }); expect(saved.max_vcpus).toBe(200); expect(h.quota).not.toHaveBeenCalled(); }); it("preserves explicit customer restrictions even when the owner's capacity is unlimited", async () => { const saved = Object.freeze({ max_workspaces: 7, max_vcpus: 2, max_ram_mb: 4096, max_disk_gb: 12, max_total_vcpus: 3, max_total_ram_mb: 6144, max_total_disk_gb: 24 }); await syncCloudResourceLimits("tenant-a", "team", saved); - expect(h.update).toHaveBeenCalledWith("ns-a", { resource_limits: toOblienVmLimits(saved) }); + expect(h.update).toHaveBeenCalledWith("ns-a", { resource_limits: saved }); expect(h.quota).not.toHaveBeenCalled(); }); it("does not rewrite declared policy when effective capacity differs", async () => { const declared = { max_workspaces: 52, max_vcpus: 200, max_ram_mb: 417792, max_disk_gb: 64, max_total_vcpus: 8, max_total_ram_mb: 16384, max_total_disk_gb: 256 }; - h.get.mockResolvedValue({ data: { id: "ns-a", slug: "tenant-a", resource_limits: toOblienVmLimits(declared), - effective_resource_limits: { ...toOblienVmLimits(declared), max_vcpus: 32, max_ram_mb: 65536 }, + h.get.mockResolvedValue({ data: { id: "ns-a", slug: "tenant-a", resource_limits: declared, + effective_resource_limits: { ...declared, max_vcpus: 32, max_ram_mb: 65536 }, } }); await syncCloudResourceLimits("tenant-a", "team", declared); expect(h.update).not.toHaveBeenCalled(); expect(h.quota).not.toHaveBeenCalled(); }); it("clears old declared caps only after a verified enterprise entitlement", async () => { - h.get.mockResolvedValue({ data: { id: "ns-a", slug: "tenant-a", resource_limits: { max_vms: 5 } } }); + h.get.mockResolvedValue({ data: { id: "ns-a", slug: "tenant-a", resource_limits: { max_workspaces: 5 } } }); await syncCloudResourceLimits("tenant-a", "enterprise"); - expect(h.update).toHaveBeenCalledWith("ns-a", { resource_limits: { max_vms: null, max_vcpus: null, max_ram_mb: null, max_disk_gb: null, max_total_vcpus: null, max_total_ram_mb: null, max_total_disk_gb: null } }); + expect(h.update).toHaveBeenCalledWith("ns-a", { resource_limits: { max_workspaces: null, max_vcpus: null, max_ram_mb: null, max_disk_gb: null, max_total_vcpus: null, max_total_ram_mb: null, max_total_disk_gb: null } }); }); it("cannot change policy when the provider returns another namespace", async () => { h.get.mockResolvedValue({ data: { id: "ns-b", slug: "tenant-b" } }); diff --git a/apps/api/test/lib/cloud-resource-proxy.test.ts b/apps/api/test/lib/cloud-resource-proxy.test.ts index 0c6168e0a..f41b50777 100644 --- a/apps/api/test/lib/cloud-resource-proxy.test.ts +++ b/apps/api/test/lib/cloud-resource-proxy.test.ts @@ -12,7 +12,7 @@ vi.mock("../../src/lib/request-context", () => ({ getRequestContext: () => ({ or vi.mock("../../src/modules/cloud/cloud-relay-access", () => ({ authorizeCloudRelayWorkspace: async () => null })); vi.mock("@repo/platform/engine/lib/openship-cloud", () => ({ ensureNamespace: async () => "ns-a" })); vi.mock("@repo/platform/engine/lib/oblien-client", () => ({ getOblienClient: () => ({ - vms: { get: h.workspaceGet }, + workspaces: { get: h.workspaceGet }, pages: { list: h.pageList, get: h.pageGet, create: h.pageCreate, deploy: h.pageDeploy, delete: h.pageDelete }, domain: { routes: h.routes }, routes: { set: h.setRoutes }, }) })); @@ -46,18 +46,18 @@ describe("desktop-to-SaaS Cloud resource delegation", () => { it("round-trips page reads and redeploys through the SaaS ownership checks", async () => { const proxy = createRemoteCloudAdmin("org-a"); expect(await proxy.pages!.get("site-a")).toMatchObject({ page: { namespace: "ns-a" } }); - await proxy.pages!.deploy("site-a", { vm_id: "ws-a", path: "/app/dist" }); - expect(h.pageDeploy).toHaveBeenCalledWith("site-a", { vm_id: "ws-a", path: "/app/dist" }); + await proxy.pages!.deploy("site-a", { workspace_id: "ws-a", path: "/app/dist" }); + expect(h.pageDeploy).toHaveBeenCalledWith("site-a", { workspace_id: "ws-a", path: "/app/dist" }); expect(h.spend).toHaveBeenCalledWith("org-a", null); }); it("ignores the client's namespace and pins a create to its server identity", async () => { - await createRemoteCloudAdmin("org-a").pages!.create({ vm_id: "ws-a", path: "/app/dist", name: "Site", slug: "site-a", namespace: "ns-b" }); + await createRemoteCloudAdmin("org-a").pages!.create({ workspace_id: "ws-a", path: "/app/dist", name: "Site", slug: "site-a", namespace: "ns-b" }); expect(h.pageCreate).toHaveBeenCalledWith(expect.objectContaining({ namespace: "ns-a" })); }); it("refuses both foreign page reads and foreign source exports", async () => { const pages = createRemoteCloudAdmin("org-a").pages!; await expect(pages.get("site-b")).rejects.toMatchObject({ status: 404 }); - await expect(pages.create({ vm_id: "ws-b", path: "/app/dist", name: "Site", slug: "site-a" })).rejects.toMatchObject({ status: 404 }); + await expect(pages.create({ workspace_id: "ws-b", path: "/app/dist", name: "Site", slug: "site-a" })).rejects.toMatchObject({ status: 404 }); expect(h.pageCreate).not.toHaveBeenCalled(); }); it("preserves provider 404 so the runtime can create a missing page", async () => { diff --git a/apps/api/test/lib/cloud-tenant-admin.test.ts b/apps/api/test/lib/cloud-tenant-admin.test.ts index b6e113560..fe6313b97 100644 --- a/apps/api/test/lib/cloud-tenant-admin.test.ts +++ b/apps/api/test/lib/cloud-tenant-admin.test.ts @@ -5,7 +5,7 @@ const h = vi.hoisted(() => ({ workspaceGet: vi.fn(), routes: vi.fn(), setRoutes: vi.fn(), spend: vi.fn(), pageList: vi.fn(), })); vi.mock("@repo/platform/engine/lib/oblien-client", () => ({ getOblienClient: () => ({ - vms: { get: h.workspaceGet }, + workspaces: { get: h.workspaceGet }, pages: { list: h.pageList, get: h.pageGet, create: h.pageCreate, delete: h.pageDelete, disable: h.pageDisable, deploy: h.pageDeploy }, domain: { routes: h.routes }, routes: { set: h.setRoutes }, }) })); @@ -32,12 +32,12 @@ describe("admin-only cloud delegation", () => { }); it("rejects another customer's workspace before exporting a page", async () => { const proxy = createTenantCloudAdmin("org-one", "ns-own"); - await expect(proxy.pages!.create({ vm_id: "ws-other", path: "/app/dist", name: "test", slug: "test" })).rejects.toMatchObject({ statusCode: 404 }); + await expect(proxy.pages!.create({ workspace_id: "ws-other", path: "/app/dist", name: "test", slug: "test" })).rejects.toMatchObject({ statusCode: 404 }); expect(h.pageCreate).not.toHaveBeenCalled(); }); it("pins page creation to the authenticated namespace", async () => { const proxy = createTenantCloudAdmin("org-one", "ns-own"); - await proxy.pages!.create({ vm_id: "ws-own", path: "/app/dist", name: "test", slug: "test", namespace: "ns-other" }); + await proxy.pages!.create({ workspace_id: "ws-own", path: "/app/dist", name: "test", slug: "test", namespace: "ns-other" }); expect(h.pageCreate).toHaveBeenCalledWith(expect.objectContaining({ namespace: "ns-own" })); expect(h.spend).toHaveBeenCalledWith("org-one", undefined); }); @@ -45,7 +45,7 @@ describe("admin-only cloud delegation", () => { const pages = createTenantCloudAdmin("org-one", "ns-own").pages!; await expect(pages.get("other-page")).rejects.toMatchObject({ statusCode: 404 }); await expect(pages.delete("other-page")).rejects.toMatchObject({ statusCode: 404 }); - await expect(pages.deploy("other-page", { vm_id: "ws-own", path: "/app/dist" })).rejects.toMatchObject({ statusCode: 404 }); + await expect(pages.deploy("other-page", { workspace_id: "ws-own", path: "/app/dist" })).rejects.toMatchObject({ statusCode: 404 }); expect(h.pageDelete).not.toHaveBeenCalled(); expect(h.pageDeploy).not.toHaveBeenCalled(); }); @@ -59,11 +59,11 @@ describe("admin-only cloud delegation", () => { }); it("validates both hostname and every route target before an admin mutation", async () => { const proxy = createTenantCloudAdmin("org-one", "ns-own"); - const routes = [{ match: { path: "/" }, action: { kind: "proxy" as const, vm: "ws-other", port: 8080 } }]; + const routes = [{ match: { path: "/" }, action: { kind: "proxy" as const, workspace: "ws-other", port: 8080 } }]; await expect(proxy.setRoutes!("own.opsh.io", { routes })).rejects.toMatchObject({ statusCode: 404 }); await expect(proxy.setRoutes!("other.opsh.io", { routes: [] })).rejects.toMatchObject({ statusCode: 404 }); expect(h.setRoutes).not.toHaveBeenCalled(); - await proxy.setRoutes!("own.opsh.io", { routes: [{ ...routes[0]!, action: { kind: "proxy", vm: "ws-own", port: 8080 } }] }); + await proxy.setRoutes!("own.opsh.io", { routes: [{ ...routes[0]!, action: { kind: "proxy", workspace: "ws-own", port: 8080 } }] }); expect(h.setRoutes).toHaveBeenCalledOnce(); }); it("does not use reseller authority for unverified external proxy origins", async () => { diff --git a/apps/api/test/lib/controller-sse-drain.test.ts b/apps/api/test/lib/controller-sse-drain.test.ts deleted file mode 100644 index fd2e2ffcc..000000000 --- a/apps/api/test/lib/controller-sse-drain.test.ts +++ /dev/null @@ -1,71 +0,0 @@ -import { afterEach, beforeEach, expect, it, vi } from "vitest"; -import { Hono } from "hono"; -import type { SSEStreamingApi } from "hono/streaming"; -import { closeControllerStreams, resumeControllerStreams, streamSSE } from "../../src/lib/sse"; -import { drainBackgroundWork } from "@repo/platform/engine/lib/background-work"; - -beforeEach(() => resumeControllerStreams()); -afterEach(async () => { - closeControllerStreams(); - await drainBackgroundWork(); - resumeControllerStreams(); -}); - -it("refuses a stream admitted before the move but initialized after streams were closed", async () => { - let enter!: () => void; - let proceed!: () => void; - const entered = new Promise(resolve => { enter = resolve; }); - const admitted = new Promise(resolve => { proceed = resolve; }); - const callback = vi.fn(async (stream: SSEStreamingApi) => { - await new Promise(resolve => stream.onAbort(resolve)); - }); - const app = new Hono(); - app.get("/events", async c => { - enter(); - await admitted; // permission/metadata read already admitted by the HTTP guard - return streamSSE(c, callback); - }); - const pending = app.request("/events"); - await entered; - closeControllerStreams(); - proceed(); - const response = await pending; - try { - expect(response.status).toBe(503); - expect(await response.json()).toMatchObject({ code: "INSTANCE_CONTROLLER_INACTIVE" }); - expect(callback).not.toHaveBeenCalled(); - } finally { - closeControllerStreams(); - if (!response.bodyUsed) await response.body?.cancel(); - await drainBackgroundWork(); - } -}); - -it("aborts an existing subscriber so the controller can finish draining", async () => { - const aborted = vi.fn(); - const app = new Hono(); - app.get("/events", c => streamSSE(c, async stream => { - await new Promise(resolve => stream.onAbort(() => { aborted(); resolve(); })); - })); - const response = await app.request("/events"); - expect(response.status).toBe(200); - closeControllerStreams(); - await drainBackgroundWork(); - expect(aborted).toHaveBeenCalledOnce(); - await response.body?.cancel(); -}); - -it("accepts streams again when the active controller is resumed after cancellation", async () => { - const callback = vi.fn(async () => {}); - const app = new Hono(); - app.get("/events", c => streamSSE(c, callback)); - closeControllerStreams(); - const refused = await app.request("/events"); - expect(refused.status).toBe(503); - expect(callback).not.toHaveBeenCalled(); - resumeControllerStreams(); - const response = await app.request("/events"); - expect(response.status).toBe(200); - expect(callback).toHaveBeenCalledOnce(); - await response.body?.cancel(); -}); diff --git a/apps/api/test/lib/email-templates.test.ts b/apps/api/test/lib/email-templates.test.ts index be313f41d..00a84f123 100644 --- a/apps/api/test/lib/email-templates.test.ts +++ b/apps/api/test/lib/email-templates.test.ts @@ -5,11 +5,7 @@ */ import { describe, expect, it } from "vitest"; -import { - existingAccountEmail, - organizationInviteEmail, - resetPasswordOtpEmail, -} from "@repo/platform/engine/lib/email-templates"; +import { organizationInviteEmail, resetPasswordOtpEmail } from "@repo/platform/engine/lib/email-templates"; describe("email-templates — HTML injection is neutralized", () => { it("escapes attacker-controlled org name and inviter name in the invite HTML", () => { @@ -68,15 +64,4 @@ describe("email-templates — HTML injection is neutralized", () => { expect(email.html).not.toContain(" { - const email = existingAccountEmail( - { name: '', email: "customer@example.test" }, - "https://dashboard.example.test", - ); - expect(email.html).not.toContain(" { - vi.unstubAllEnvs(); - vi.resetModules(); -}); - -it.each([ - [undefined, "https://vm.oblien.com"], - ["https://runtime.staging.example", "https://runtime.staging.example"], -])("configures the native VM credential endpoint with override %s", async (override, expected) => { - vi.resetModules(); - vi.stubEnv("NODE_ENV", "test"); - vi.stubEnv("BILLING_ENABLED", "false"); - vi.stubEnv("OBLIEN_RUNTIME_URL", override); - const { env } = await import("@repo/platform/engine/config/env"); - expect(env.OBLIEN_RUNTIME_URL).toBe(expected); -}); diff --git a/apps/api/test/lib/permission-grant-satisfiability.test.ts b/apps/api/test/lib/permission-grant-satisfiability.test.ts index bc4816867..f4baf51a2 100644 --- a/apps/api/test/lib/permission-grant-satisfiability.test.ts +++ b/apps/api/test/lib/permission-grant-satisfiability.test.ts @@ -24,10 +24,9 @@ import type { RequestContext } from "../../src/lib/request-context"; * the grantable surface without proving it authorizes something → this fails. */ -// Exercise grant algebra under an owner's ceiling; members cannot delegate admin. vi.mock("@repo/db", () => ({ repos: { - member: { find: vi.fn(async () => ({ id: "m1", role: "owner" })) }, + member: { find: vi.fn(async () => ({ id: "m1", role: "member" })) }, project: { findById: vi.fn(async (id: string) => (id === "*" ? null : { id, organizationId: "org1" })), findEnvVarById: vi.fn(async () => null), diff --git a/apps/api/test/lib/permission-own-projects.test.ts b/apps/api/test/lib/permission-own-projects.test.ts index 0f3a3edf0..d1b2a52b9 100644 --- a/apps/api/test/lib/permission-own-projects.test.ts +++ b/apps/api/test/lib/permission-own-projects.test.ts @@ -3,10 +3,9 @@ import { describe, it, expect, vi } from "vitest"; // checkPermission touches only member.find (membership gate) and, for a // concrete project id, project.findById (org resolution). We pass the grant // source explicitly via opts, so resourceGrant is never consulted. -// The owner can delegate project admin; the token must still satisfy each grant. vi.mock("@repo/db", () => ({ repos: { - member: { find: vi.fn(async () => ({ id: "m1", role: "owner" })) }, + member: { find: vi.fn(async () => ({ id: "m1", role: "member" })) }, project: { findById: vi.fn(async (id: string) => id === "*" ? null : { id, organizationId: "org1" }, diff --git a/apps/api/test/lib/permission-wildcard-list-arm.test.ts b/apps/api/test/lib/permission-wildcard-list-arm.test.ts index 0620fa0ff..d92e3788a 100644 --- a/apps/api/test/lib/permission-wildcard-list-arm.test.ts +++ b/apps/api/test/lib/permission-wildcard-list-arm.test.ts @@ -19,10 +19,9 @@ import { describe, it, expect, vi } from "vitest"; -// The owner's role ceiling permits delegation; the tests enforce grant widths. vi.mock("@repo/db", () => ({ repos: { - member: { find: vi.fn(async () => ({ id: "m1", role: "owner" })) }, + member: { find: vi.fn(async () => ({ id: "m1", role: "member" })) }, project: { findById: vi.fn(async (id: string) => (id === "*" ? null : { id, organizationId: "org1" })), findEnvVarById: vi.fn(async () => null), @@ -199,7 +198,7 @@ describe("a full project wildcard now lists and creates (deliberate widening)", }); describe("non-restricted roles are untouched by this arm", () => { - it("an owner is authorized by role, without consulting grants", async () => { + it("a member is authorized by role, without consulting grants", async () => { const boom = { findForResource: async () => { throw new Error("the role arm must return before any grant lookup"); diff --git a/apps/api/test/lib/profile-avatar.test.ts b/apps/api/test/lib/profile-avatar.test.ts deleted file mode 100644 index 31d4e4604..000000000 --- a/apps/api/test/lib/profile-avatar.test.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { expect, it } from "vitest"; -import { auth } from "@repo/platform/engine/lib/auth"; -import { provisionUser } from "@repo/platform/engine/lib/provision-user"; -import { mintSession } from "../../src/lib/cloud-auth-proxy"; -import { db, schema, eq } from "@repo/db"; -import { randomUUID } from "node:crypto"; - -it("updates only the signed-in user's avatar through the existing auth endpoint and rejects unsafe URLs", async () => { - const id = randomUUID(); - await provisionUser({ - id, - email: `${id}@example.test`, - name: "Avatar owner", - emailVerified: true, - }); - const session = await mintSession({ purpose: "local-cookie", userId: id }); - const update = (image: unknown, token: string | null = session.token, extra = {}) => - auth.handler( - new Request("http://localhost:4000/api/auth/update-user", { - method: "POST", - headers: { - "Content-Type": "application/json", - ...(token ? { Authorization: `Bearer ${token}` } : {}), - }, - body: JSON.stringify({ image, ...extra }), - }), - ); - expect((await update("https://cdn.example.test/avatar.png", null)).status).toBe(401); - const result = await update("https://cdn.example.test/avatar.png"); - expect(result.status, await result.clone().text()).toBe(200); - expect(await db.query.user.findFirst({ where: eq(schema.user.id, id) })).toMatchObject({ - image: "https://cdn.example.test/avatar.png", - role: "user", - }); - expect( - await auth.api.getSession({ - headers: new Headers({ Authorization: `Bearer ${session.token}` }), - }), - ).toMatchObject({ user: { image: "https://cdn.example.test/avatar.png" } }); - expect( - (await update("https://cdn.example.test/avatar.png", session.token, { role: "admin" })).status, - ).toBe(400); - for (const image of [ - "javascript:alert(1)", - "data:image/svg+xml,", - "https://user:secret@example.test/a.png", - "/avatar.png", - 123, - ]) - expect((await update(image)).status).toBe(400); - expect((await update(null)).status).toBe(200); - expect(await db.query.user.findFirst({ where: eq(schema.user.id, id) })).toMatchObject({ - image: null, - }); -}); diff --git a/apps/api/test/modules/actions/billing-webhook.test.ts b/apps/api/test/modules/actions/billing-webhook.test.ts index 1eb01e4dc..8e547c7b2 100644 --- a/apps/api/test/modules/actions/billing-webhook.test.ts +++ b/apps/api/test/modules/actions/billing-webhook.test.ts @@ -450,7 +450,7 @@ describe("Actions namespace preparation before checkout", () => { name: "Openship Actions", slug: f.namespace, resource_limits: { - max_vms: 0, + max_workspaces: 0, max_vcpus: 0, max_ram_mb: 0, max_disk_gb: 0, diff --git a/apps/api/test/modules/apps/app-install-routing.test.ts b/apps/api/test/modules/apps/app-install-routing.test.ts index 980fffc58..992ecf782 100644 --- a/apps/api/test/modules/apps/app-install-routing.test.ts +++ b/apps/api/test/modules/apps/app-install-routing.test.ts @@ -703,41 +703,3 @@ it("deduplicates an interpolated secret also declared as a generated config fiel vars.filter((v: { key: string }) => v.key === "OPENSHIP_ADMIN_PASSWORD"), ).toHaveLength(1); }); - -function templateWithConfigPorts() { - const template = structuredClone(getAppTemplate("convex")!); - template.id = "config-ports-test"; - template.configFields = [ - { key: "HOST_PORT", service: "backend", label: "Host port", default: "8181" }, - { key: "HTTP_PORT", service: "backend", label: "Container port", default: "8080" }, - ]; - template.services!.find(service => service.name === "backend")!.ports = ["{{config:HOST_PORT}}:{{config:HTTP_PORT}}/tcp"]; - customTemplateMock.mockResolvedValue({ template }); - return template; -} - -it("substitutes port defaults before validating routes and preserves the cached template", async () => { - const template = templateWithConfigPorts(); - await installApp(ctx, { templateId: template.id, routes: [{ service: "backend", port: 8080, mode: "port" }] }); - expect(payloadFor("backend")?.ports).toEqual(["0.0.0.0:8181:8080/tcp"]); - expect(template.services![0]!.ports).toEqual(["{{config:HOST_PORT}}:{{config:HTTP_PORT}}/tcp"]); -}); - -it("uses supplied port values for both route validation and service creation", async () => { - const template = templateWithConfigPorts(); - await installApp(ctx, { - templateId: template.id, config: { HOST_PORT: "9191", HTTP_PORT: "9090" }, - routes: [{ service: "backend", port: 9090, mode: "port" }], - }); - expect(payloadFor("backend")?.ports).toEqual(["0.0.0.0:9191:9090/tcp"]); -}); - -it("uses resolved authored ports when undoing port-only access on an adopted draft", async () => { - const template = templateWithConfigPorts(); - draftMock.mockResolvedValue({ id: "p1", slug: "draft", name: "Draft" }); - listServicesMock.mockResolvedValue(template.services!.map(service => ({ id: `svc-${service.name}`, name: service.name, ports: service.name === "backend" ? ["0.0.0.0:8181:8080/tcp"] : [] }))); - await installApp(ctx, { templateId: template.id, routes: [{ service: "backend", port: 8080, mode: "custom", customDomain: "ports.example.com" }] }); - expect(updateServiceMock).toHaveBeenCalledWith(ctx, "p1", "svc-backend", expect.objectContaining({ ports: ["8181:8080/tcp"] })); - expect(createServiceMock).not.toHaveBeenCalled(); - expect(setEnvMock).not.toHaveBeenCalled(); -}); diff --git a/apps/api/test/modules/apps/cloud-install-cleanup.integration.test.ts b/apps/api/test/modules/apps/cloud-install-cleanup.integration.test.ts index 383127280..f92314c2a 100644 --- a/apps/api/test/modules/apps/cloud-install-cleanup.integration.test.ts +++ b/apps/api/test/modules/apps/cloud-install-cleanup.integration.test.ts @@ -105,7 +105,7 @@ beforeEach(async () => { } const method = init?.method ?? "GET"; requests.push(`${method} ${url.pathname}`); - if (url.pathname === "/vms" && method === "POST") { + if (url.pathname === "/workspace" && method === "POST") { if (createMode === "quota" || createMode === "legacy-quota") { return Response.json( { success: false, code: "NAMESPACE_LIMIT_REACHED" }, @@ -133,27 +133,27 @@ beforeEach(async () => { return Response.json( { code: "CREATE_FAILED", - details: { vm_id: workspace.id }, + details: { workspace_id: workspace.id }, }, { status: 422 }, ); } - if (url.pathname === "/vms" && method === "GET") { + if (url.pathname === "/workspace" && method === "GET") { return Response.json({ success: true, - vms: [...workspaces.values()], + workspaces: [...workspaces.values()], total: workspaces.size, limit: 100, page: 1, }); } - const workspaceId = url.pathname.match(/^\/vms\/([^/]+)$/)?.[1]; - const retryId = url.pathname.match(/^\/vms\/([^/]+)\/provisioning\/retry$/)?.[1]; + const workspaceId = url.pathname.match(/^\/workspace\/([^/]+)$/)?.[1]; + const retryId = url.pathname.match(/^\/workspace\/([^/]+)\/provisioning\/retry$/)?.[1]; if (retryId && method === "POST") { const workspace = workspaces.get(retryId)!; workspace.status = "running"; workspace.provisioning.state = "ready"; - return Response.json({ success: true, vm: workspace }); + return Response.json({ success: true, workspace }); } if (url.pathname.endsWith("/lifecycle/permanent") && method === "POST") return Response.json({ success: true }); @@ -162,7 +162,7 @@ beforeEach(async () => { if (deleting.has(workspaceId)) workspaces.delete(workspaceId); const workspace = workspaces.get(workspaceId); return workspace - ? Response.json({ success: true, vm: workspace }) + ? Response.json({ success: true, workspace }) : Response.json({ code: "NOT_FOUND" }, { status: 404 }); } if (workspaceId && method === "DELETE") { diff --git a/apps/api/test/modules/billing/billing-sdk-parity.test.ts b/apps/api/test/modules/billing/billing-sdk-parity.test.ts index e7de42cd1..4dea70ffd 100644 --- a/apps/api/test/modules/billing/billing-sdk-parity.test.ts +++ b/apps/api/test/modules/billing/billing-sdk-parity.test.ts @@ -1,5 +1,4 @@ import { savedOffer as subscriptionOffer, savedMetadata as subscriptionMetadata } from "../../helpers/saved-cloud-offer"; -import { providerBillingFixture } from "../../helpers/oblien-vm-billing"; import capacityCatalog from "../../fixtures/oblien-capacity-catalog.json"; import { monthlyCloudBilling } from "../../helpers/monthly-cloud-offer"; import managedTransfer from "../../fixtures/oblien-managed-transfer.json"; @@ -61,7 +60,7 @@ vi.mock("@repo/platform/engine/lib/oblien-client", () => ({ }), }), getOblienClient: () => ({ - vms: { getQuota: provider.quota, get: provider.workspace }, + workspaces: { getQuota: provider.quota, get: provider.workspace }, namespaces: { ensure: provider.namespaces, get: provider.resourceRead, @@ -193,8 +192,8 @@ describe("billing through the same SDK and HTTP application operations", () => { // Exercise the actual SDK/validator before the shared application operation; // a mock entitlement alone missed the provider's newly included transfer. const billing = new OblienBillingApi({ clientId: "test-id", clientSecret: "test-secret", - fetch: (async url => Response.json(providerBillingFixture(new URL(String(url)).pathname === "/v1/billing/balance" - ? monthly.balance : monthly.entitlement))) as typeof fetch }); + fetch: (async url => Response.json(new URL(String(url)).pathname === "/billing/balance" + ? monthly.balance : monthly.entitlement)) as typeof fetch }); provider.subscriptions.set(selected.namespace!, monthly.subscription); provider.entitlement.mockImplementation(async namespace => namespace === selected.namespace ? billing.getEntitlement(namespace) : { success: true, namespace, tierId: null, status: "credit_exhausted", @@ -268,13 +267,13 @@ describe("billing through the same SDK and HTTP application operations", () => { data: { slug, effective_resource_limits: { - max_vms: 12, + max_workspaces: 12, max_total_vcpus: 8, max_total_ram_mb: 16384, max_total_disk_gb: 256, }, allocated_resource_usage: { - vms: 0, + workspaces: 0, vcpus: 0, ram_mb: 0, disk_gb: 0, diff --git a/apps/api/test/modules/billing/credit-alert.test.ts b/apps/api/test/modules/billing/credit-alert.test.ts index 437b90dae..d02ca881d 100644 --- a/apps/api/test/modules/billing/credit-alert.test.ts +++ b/apps/api/test/modules/billing/credit-alert.test.ts @@ -23,19 +23,13 @@ const input = { eventType: "namespace.quota.threshold", eventId: "evt1", timestamp: "2026-09-28T00:00:00Z", - data: { namespace: "tenant", service: "vm_compute", threshold: 95, alert: { limit: 4000 } }, + data: { namespace: "tenant", service: "workspace_vm", threshold: 95, alert: { limit: 4000 } }, organizationId: "org-a", dashboardUrl: "https://app.openship.io", entitlement: state(), }; describe("provider credit alerts", () => { - it("accepts a pre-cutover delivery without changing its idempotency key", () => { - const result = creditAlertNotification({ - ...input, data: { ...input.data, service: "workspace_vm" }, - }); - expect(result).toEqual(creditAlertNotification(input)); - }); it("uses current provider numbers and an organization-bound billing link", () => { const result = creditAlertNotification(input)!; expect(result.payload.message).toContain("95%"); diff --git a/apps/api/test/modules/cloud-execution-access.test.ts b/apps/api/test/modules/cloud-execution-access.test.ts index 1812cf15b..3402dfe1e 100644 --- a/apps/api/test/modules/cloud-execution-access.test.ts +++ b/apps/api/test/modules/cloud-execution-access.test.ts @@ -120,7 +120,7 @@ describe("Cloud relays cannot substitute Cloud feature access for host administr expect(await response.json()).toMatchObject({ data: { token: "provider-secret" } }); }); - it.each(["owner", "admin"])( + it.each(["owner", "admin", "member"])( "preserves existing full host access for the %s role", async (role) => { await db.update(schema.member).set({ role }).where(eq(schema.member.id, memberId)); @@ -129,17 +129,6 @@ describe("Cloud relays cannot substitute Cloud feature access for host administr }, ); - it("denies members host credentials through both Cloud relay selectors", async () => { - await db.update(schema.member).set({ role: "member" }).where(eq(schema.member.id, memberId)); - for (const path of ["token", `token?serverId=${serverId}`, "resource-proxy", `resource-proxy?serverId=${serverId}`]) { - const response = await post(path, { operation: "list" }); - expect(response.status, await response.clone().text()).toBe(404); - } - expect(h.token).not.toHaveBeenCalled(); - expect(h.namespace).not.toHaveBeenCalled(); - expect(h.pages).not.toHaveBeenCalled(); - }); - it("does not bootstrap a server or credentials for an empty organization without host authority", async () => { actor = await seedOwner(); const membership = (await repos.member.find(actor.orgId, actor.userId))!; @@ -222,7 +211,7 @@ describe("Cloud relays cannot substitute Cloud feature access for host administr it.each([ ["preflight", {}], - ["pages", { vm_id: "vm-own", path: "/private", name: "export", slug: "export" }], + ["pages", { workspace_id: "vm-own", path: "/private", name: "export", slug: "export" }], ["pages/enable", { slug: "own-page" }], ["pages/disable", { slug: "own-page" }], ["pages/delete", { slug: "own-page" }], diff --git a/apps/api/test/modules/cloud-workspaces/lifecycle.integration.test.ts b/apps/api/test/modules/cloud-workspaces/lifecycle.integration.test.ts index 34e133682..44dfb01c6 100644 --- a/apps/api/test/modules/cloud-workspaces/lifecycle.integration.test.ts +++ b/apps/api/test/modules/cloud-workspaces/lifecycle.integration.test.ts @@ -218,7 +218,7 @@ beforeEach(async () => { expiresAt: "2030-01-01T00:00:00Z", })), }, - vms: { + workspaces: { create: vi.fn(async (input: any) => { const existing = [...vms.values()].find((vm) => vm.slug === input.slug); if (existing) return existing; @@ -242,7 +242,7 @@ beforeEach(async () => { return vm; }), list: vi.fn(async () => ({ - vms: [...vms.values()], + workspaces: [...vms.values()], total: vms.size, page: 1, limit: 100, @@ -260,9 +260,9 @@ beforeEach(async () => { vms.delete(id); return { success: true }; }), - vm: (id: string) => ({ + workspace: (id: string) => ({ id, - get: () => h.client.vms.get(id), + get: () => h.client.workspaces.get(id), lifecycle: { makePermanent: async () => {} }, resources: { update: (input: any) => h.client.resize(id, input) }, delete: () => h.client.delete(id), @@ -433,7 +433,7 @@ describe("subscription-owned Cloud workspace lifecycle", () => { expect((await request("POST", `/${workspace.id}/ensure`, undefined, stranger)).status).toBe( 404, ); - expect(h.client.vms.create).not.toHaveBeenCalled(); + expect(h.client.workspaces.create).not.toHaveBeenCalled(); const invalid = await request("POST", "", { name: "Broken", mode: "shared", @@ -468,7 +468,7 @@ describe("subscription-owned Cloud workspace lifecycle", () => { }); expect(observed.isError).toBe(false); expect(JSON.parse(observed.content[0].text).managed.operation.status).toBe("succeeded"); - expect(h.client.vms.create).toHaveBeenCalledTimes(1); + expect(h.client.workspaces.create).toHaveBeenCalledTimes(1); const outsider = await seedOwner(); expect( @@ -492,7 +492,7 @@ describe("subscription-owned Cloud workspace lifecycle", () => { }) ).isError, ).toBe(true); - expect(h.client.vms.create).toHaveBeenCalledTimes(1); + expect(h.client.workspaces.create).toHaveBeenCalledTimes(1); }); it("provisions on paid reconciliation and reuses one host across simultaneous project deployments", async () => { await syncOblienEntitlement(owner.orgId, { workspaceId: workspace.id }); @@ -512,7 +512,7 @@ describe("subscription-owned Cloud workspace lifecycle", () => { ); expect(targets[0]?.workspaceId).toBe(targets[1]?.workspaceId); expect(targets.map((target) => target.ownerWorkspaceId)).toEqual([workspace.id, workspace.id]); - expect(h.client.vms.create).toHaveBeenCalledTimes(1); + expect(h.client.workspaces.create).toHaveBeenCalledTimes(1); expect(h.client.resize).not.toHaveBeenCalled(); expect(vms.get(targets[0]!.workspaceId).resources).toMatchObject({ cpus: 1, @@ -544,7 +544,7 @@ describe("subscription-owned Cloud workspace lifecycle", () => { await expect( resolveSnapshotTarget(saved, { serverId: otherServer.id, deployTarget: "server" }), ).rejects.toMatchObject({ code: "CLOUD_WORKSPACE_TARGET_CONFLICT" }); - expect(h.client.vms.create).not.toHaveBeenCalled(); + expect(h.client.workspaces.create).not.toHaveBeenCalled(); }); it("places bare and Docker projects on managed servers without provisioning a second host", async () => { const sdk = await nativeShip(); @@ -557,7 +557,7 @@ describe("subscription-owned Cloud workspace lifecycle", () => { const docker = await sdk.projects.create({ name: "Docker app", serverId: selected.serverId }); for (const project of [bare, docker]) expect(await repos.project.findById(project.id)).toMatchObject({ serverId: selected.serverId, workspaceId: selected.id }); - expect(h.client.vms.create).not.toHaveBeenCalled(); + expect(h.client.workspaces.create).not.toHaveBeenCalled(); }); it("installs and previews catalog apps on the selected managed server without creating a project VM", async () => { subscribe("starter"); @@ -583,7 +583,7 @@ describe("subscription-owned Cloud workspace lifecycle", () => { await expect( stranger.apps.install({ templateId: "redis", serverId: server.id }), ).rejects.toMatchObject({ statusCode: 404 }); - expect(h.client.vms.create).not.toHaveBeenCalled(); + expect(h.client.workspaces.create).not.toHaveBeenCalled(); }); it("carries one managed server through source staging, scan and project creation", async () => { const sdk = await nativeShip(); @@ -614,15 +614,15 @@ describe("subscription-owned Cloud workspace lifecycle", () => { await expect(stranger.sources.scan(staged.sessionId)).rejects.toMatchObject({ statusCode: 404, }); - expect(h.client.vms.create).not.toHaveBeenCalled(); + expect(h.client.workspaces.create).not.toHaveBeenCalled(); } finally { const session = deleteFolderSession(staged.sessionId); if (session?.stagingDir) await rm(session.stagingDir, { recursive: true, force: true }); } }); it("recovers a lost provider create response with the same request and disk", async () => { - const create = h.client.vms.create.getMockImplementation()!; - h.client.vms.create.mockImplementationOnce(async (input: any) => { + const create = h.client.workspaces.create.getMockImplementation()!; + h.client.workspaces.create.mockImplementationOnce(async (input: any) => { await create(input); throw new Error("create response lost"); }); @@ -642,7 +642,7 @@ describe("subscription-owned Cloud workspace lifecycle", () => { ); expect(vms.size).toBe(1); expect( - new Set(h.client.vms.create.mock.calls.map(([input]: any[]) => input.idempotency_key)) + new Set(h.client.workspaces.create.mock.calls.map(([input]: any[]) => input.idempotency_key)) .size, ).toBe(1); expect( @@ -651,7 +651,7 @@ describe("subscription-owned Cloud workspace lifecycle", () => { ).toBe([...vms.keys()][0]); }); it("stops after three provisioning failures and durably escalates once without retrying the host", async () => { - h.client.vms.create.mockRejectedValue(new AppError("Hosts are temporarily at capacity", 503, "CLOUD_CAPACITY_UNAVAILABLE")); + h.client.workspaces.create.mockRejectedValue(new AppError("Hosts are temporarily at capacity", 503, "CLOUD_CAPACITY_UNAVAILABLE")); expect((await request("POST", `/${workspace.id}/ensure`)).status).toBe(202); await drainBackgroundWork(); const createTicket = vi.spyOn(repos.cloudSupport, "create").mockRejectedValueOnce(new Error("support database temporarily unavailable")); @@ -673,7 +673,7 @@ describe("subscription-owned Cloud workspace lifecycle", () => { expect(await repos.cloudSupport.find(ticketId)).toMatchObject({ status: "open", ownerUserId: owner.userId }); expect(await repos.cloudSupport.messages(ticketId)).toHaveLength(2); await processWorkspaceOperation(workspace.id); - expect(h.client.vms.create).toHaveBeenCalledTimes(3); + expect(h.client.workspaces.create).toHaveBeenCalledTimes(3); expect(await repos.cloudSupport.messages(ticketId)).toHaveLength(2); expect((await repos.cloudWorkspace.listPendingOperations()).map(row => row.id)).not.toContain(workspace.id); createTicket.mockRestore(); @@ -707,7 +707,7 @@ describe("subscription-owned Cloud workspace lifecycle", () => { }, }); expect((await deliver("bad-signature")).status).toBe(401); - expect(h.client.vms.create).not.toHaveBeenCalled(); + expect(h.client.workspaces.create).not.toHaveBeenCalled(); expect(await db.select().from(schema.cloudCustomerEmail).where(eq(schema.cloudCustomerEmail.organizationId, owner.orgId))).toEqual([]); h.billing.getCheckout.mockImplementation(async () => ({ checkout: { @@ -731,7 +731,7 @@ describe("subscription-owned Cloud workspace lifecycle", () => { .map(mail => mail.kind).sort()).toEqual(["invoice", "purchase"]); expect(result[2]).toMatchObject({ fulfilled: true, creditsGranted: 0 }); await drainBackgroundWork(); - expect(h.client.vms.create).toHaveBeenCalledTimes(1); + expect(h.client.workspaces.create).toHaveBeenCalledTimes(1); expect((await repos.cloudWorkspace.findById(workspace.id))?.operation?.status).toBe( "succeeded", ); @@ -764,7 +764,7 @@ describe("subscription-owned Cloud workspace lifecycle", () => { await expect(client.resize(server.id, { revision: "a".repeat(64), confirmRestart: true, idempotencyKey: randomUUID() })) .rejects.toMatchObject({ code: "TOKEN_READ_ONLY" }); } - expect(h.client.vms.create).not.toHaveBeenCalled(); + expect(h.client.workspaces.create).not.toHaveBeenCalled(); }); it("recovers one draft and its server across concurrent native/HTTP creates and scopes retries by organization", async () => { @@ -779,7 +779,7 @@ describe("subscription-owned Cloud workspace lifecycle", () => { const stranger = await seedOwner(); const other = await (await clients(stranger))[0]!.createManaged(input); expect(other.id).not.toBe(created[0]!.id); - expect(h.client.vms.create).not.toHaveBeenCalled(); + expect(h.client.workspaces.create).not.toHaveBeenCalled(); }); it("never recreates a deleted purchase identity or its old provider namespace", async () => { @@ -791,14 +791,14 @@ describe("subscription-owned Cloud workspace lifecycle", () => { await expect(native!.createManaged(input)).rejects.toMatchObject({ code: "CLOUD_WORKSPACE_PURCHASE_REMOVED" }); await expect(remote!.createManaged(input)).rejects.toMatchObject({ code: "CLOUD_WORKSPACE_PURCHASE_REMOVED" }); expect(await repos.cloudWorkspace.findById(created.id)).toBeUndefined(); - expect(h.client.vms.create).not.toHaveBeenCalled(); + expect(h.client.workspaces.create).not.toHaveBeenCalled(); }); it("does not provision, stop or change the entitlement mirror when provider billing is unavailable", async () => { await syncOblienEntitlement(owner.orgId, { workspaceId: workspace.id }); h.billing.getEntitlement.mockRejectedValue(new Error("Billing temporarily unavailable")); const response = await request("POST", `/${workspace.id}/ensure`); expect(response.status).toBe(500); - expect(h.client.vms.create).not.toHaveBeenCalled(); + expect(h.client.workspaces.create).not.toHaveBeenCalled(); expect(h.client.delete).not.toHaveBeenCalled(); expect((await repos.cloudWorkspace.findById(workspace.id))?.subscriptionStatus).toBe("active"); }); @@ -917,7 +917,7 @@ describe("subscription-owned Cloud workspace lifecycle", () => { expect((await request("POST", `/${workspace.id}/ensure`)).body.code).toBe( "CLOUD_SERVER_LINK_REQUIRED", ); - expect(h.client.vms.create).not.toHaveBeenCalled(); + expect(h.client.workspaces.create).not.toHaveBeenCalled(); }); }); @@ -1757,7 +1757,7 @@ describe("managed server free-domain scope", () => { expect((await repos.domain.listByProject(id)).map(domain => domain.hostname)).toContain(`routed-${entry}.opsh.io`); expect(h.billing.getEntitlement).toHaveBeenCalled(); expect(h.billing.getEntitlement.mock.calls.every(([namespace]: [string]) => namespace === workspace.namespace)).toBe(true); - expect(h.client.vms.create).not.toHaveBeenCalled(); + expect(h.client.workspaces.create).not.toHaveBeenCalled(); }); it("uses the selected metered server's entitlement and allowance", async () => { subscribe("starter"); @@ -1780,7 +1780,7 @@ describe("managed server free-domain scope", () => { expect((await repos.service.listByProject(project.id))[0]?.domain).toBe("metered-service"); expect(h.billing.getEntitlement).toHaveBeenCalled(); expect(h.billing.getEntitlement.mock.calls.every(([namespace]: [string]) => namespace === workspace.namespace)).toBe(true); - expect(h.client.vms.create).not.toHaveBeenCalled(); + expect(h.client.workspaces.create).not.toHaveBeenCalled(); }); it.each(["ensure", "update"] as const)("refuses excess free domains before %s changes an existing project's fields", async entry => { const sdk = await nativeShip(); @@ -1823,7 +1823,7 @@ describe("managed server free-domain scope", () => { envVars: {}, })).rejects.toMatchObject({ code: "PLAN_UPGRADE_REQUIRED", reason: "free-subdomain-limit" }); expect((await repos.deployment.listByProject(project.id)).rows).toEqual([]); - expect(h.client.vms.create).not.toHaveBeenCalled(); + expect(h.client.workspaces.create).not.toHaveBeenCalled(); }); it("does not count dormant routes outside an exclusive service deployment", async () => { const project = await addProject("Exclusive routes"); @@ -1839,7 +1839,7 @@ describe("managed server free-domain scope", () => { envVars: {}, serviceIds: [selected.id], strictServiceScope: true, }); expect(queued).toMatchObject({ status: "queued" }); - expect(h.client.vms.create).not.toHaveBeenCalled(); + expect(h.client.workspaces.create).not.toHaveBeenCalled(); }); it("keeps existing free routes editable when the server's allowance is full", async () => { const sdk = await nativeShip(); @@ -1875,7 +1875,7 @@ describe("managed server free-domain scope", () => { expect(await repos.service.findById(service.id)).toMatchObject({ domain: "routed-console-updated" }); expect(h.billing.getEntitlement).toHaveBeenCalled(); expect(h.billing.getEntitlement.mock.calls.every(([namespace]: [string]) => namespace === workspace.namespace)).toBe(true); - expect(h.client.vms.create).not.toHaveBeenCalled(); + expect(h.client.workspaces.create).not.toHaveBeenCalled(); }); it("does not use a paid sibling's allowance or write a project for an unauthorized server", async () => { const sdk = await nativeShip(); @@ -1890,6 +1890,6 @@ describe("managed server free-domain scope", () => { await expect(sdk.projects.create({ ...input, serverId: foreignServer.id })).rejects.toMatchObject({ statusCode: 404 }); expect((await repos.projectGroup.listByOrganization(owner.orgId, { page: 1, perPage: 1 })).total).toBe(0); expect(h.billing.getEntitlement).not.toHaveBeenCalled(); - expect(h.client.vms.create).not.toHaveBeenCalled(); + expect(h.client.workspaces.create).not.toHaveBeenCalled(); }); }); diff --git a/apps/api/test/modules/customer-email/signup.integration.test.ts b/apps/api/test/modules/customer-email/signup.integration.test.ts index c18513ec7..b5dddde33 100644 --- a/apps/api/test/modules/customer-email/signup.integration.test.ts +++ b/apps/api/test/modules/customer-email/signup.integration.test.ts @@ -52,9 +52,6 @@ it("welcomes a real SaaS email signup only after the real OTP verification flow" password: "valid-test-password-1234!", }); expect(signup.status, await signup.clone().text()).toBe(200); - expect(h.send).toHaveBeenCalledExactlyOnceWith(expect.objectContaining({ to: email })); - const initialMail = h.send.mock.calls.at(-1)![0] as { subject: string }; - const initialCode = initialMail.subject.match(/\b\d{6}\b/)![0]; const [user] = await db.select().from(schema.user).where(eq(schema.user.email, email)); expect(user!.emailVerified).toBe(false); expect( @@ -66,7 +63,14 @@ it("welcomes a real SaaS email signup only after the real OTP verification flow" h.send.mockClear(); expect(await service().flush()).toMatchObject({ sent: 0 }); expect(h.send).not.toHaveBeenCalled(); - const verified = await request("/email-otp/verify-email", { email, otp: initialCode }); + const otp = await request("/email-otp/send-verification-otp", { + email, + type: "email-verification", + }); + expect(otp.status, await otp.clone().text()).toBe(200); + const mail = h.send.mock.calls.at(-1)![0] as { subject: string }; + const code = mail.subject.match(/\b\d{6}\b/)![0]; + const verified = await request("/email-otp/verify-email", { email, otp: code }); expect(verified.status, await verified.clone().text()).toBe(200); h.send.mockClear(); await service().flush(); @@ -166,100 +170,3 @@ it("welcomes a verified Google signup through the same outbox without repeating fetch.mockRestore(); } }, 30_000); - -it("keeps one OAuth account on repeat signup and privately explains how to sign in", async () => { - const email = `existing-google-${randomUUID()}@example.com`; - const id = randomUUID(); - await db - .insert(schema.user) - .values({ id, email, name: "Existing Google customer", emailVerified: true }); - await db - .insert(schema.account) - .values({ id: randomUUID(), accountId: randomUUID(), providerId: "google", userId: id }); - h.send.mockClear(); - for (const attempt of [1, 2]) { - const signup = await request("/sign-up/email", { - name: "Signup retry", - email, - password: `attempt-${attempt}-not-an-account-password!`, - }); - expect(signup.status, await signup.clone().text()).toBe(200); - expect((await signup.json()).token).toBeNull(); - } - expect(await db.select().from(schema.user).where(eq(schema.user.email, email))).toHaveLength(1); - expect(await db.select().from(schema.account).where(eq(schema.account.userId, id))).toMatchObject( - [{ providerId: "google", password: null }], - ); - expect(h.send).toHaveBeenCalledWith( - expect.objectContaining({ to: email, subject: "Sign in to your OpenShip account" }), - ); - const notice = h.send.mock.calls.at(-1)![0] as { text: string }; - expect(notice.text).toContain("already have"); - expect(notice.text).toContain("Google"); - const login = await request("/sign-in/email", { - email, - password: "attempt-2-not-an-account-password!", - }); - expect(login.status).toBe(401); - // A provider-only customer can add a password only after proving mailbox - // ownership through the existing recovery flow, never from duplicate signup. - h.send.mockClear(); - const reset = await request("/email-otp/request-password-reset", { email }); - expect(reset.status, await reset.clone().text()).toBe(200); - const resetMail = h.send.mock.calls.at(-1)![0] as { subject: string }; - const otp = resetMail.subject.match(/\b\d{6}\b/)![0]; - const password = "verified-mailbox-owner-new-password-1234!"; - const changed = await request("/email-otp/reset-password", { email, otp, password }); - expect(changed.status, await changed.clone().text()).toBe(200); - expect((await request("/sign-in/email", { email, password })).status).toBe(200); - expect(await db.select().from(schema.account).where(eq(schema.account.userId, id))).toHaveLength( - 2, - ); -}, 30_000); - -it("resends verification on an unverified signup retry without replacing its password", async () => { - const email = `retry-signup-${randomUUID()}@example.com`; - const password = "first-signup-password-1234!"; - const first = await request("/sign-up/email", { email, name: "Signup customer", password }); - expect(first.status).toBe(200); - h.send.mockClear(); - const retry = await request("/sign-up/email", { - email, - name: "Second attempt", - password: "different-retry-password-1234!", - }); - expect(retry.status).toBe(200); - expect(h.send).toHaveBeenCalledWith(expect.objectContaining({ to: email })); - const mail = h.send.mock.calls.at(-1)![0] as { subject: string }; - const otp = mail.subject.match(/\b\d{6}\b/)![0]; - const verified = await request("/email-otp/verify-email", { email, otp }); - expect(verified.status, await verified.clone().text()).toBe(200); - expect((await request("/sign-in/email", { email, password })).status).toBe(200); - expect( - (await request("/sign-in/email", { email, password: "different-retry-password-1234!" })).status, - ).toBe(401); - expect(await db.select().from(schema.user).where(eq(schema.user.email, email))).toHaveLength(1); -}, 30_000); - -it("recovers an initial delivery failure by retrying signup with the same account", async () => { - const email = `smtp-retry-${randomUUID()}@example.com`; - const password = "original-signup-password-1234!"; - h.send.mockClear(); - h.send.mockResolvedValueOnce(false); - const first = await request("/sign-up/email", { email, name: "SMTP retry", password }); - // Better Auth logs background delivery failures while keeping its generic response. - expect(first.status).toBe(200); - h.send.mockClear(); - const retry = await request("/sign-up/email", { - email, - name: "SMTP retry", - password: "a-different-retry-password-1234!", - }); - expect(retry.status, await retry.clone().text()).toBe(200); - expect(h.send).toHaveBeenCalledExactlyOnceWith(expect.objectContaining({ to: email })); - const mail = h.send.mock.calls.at(-1)![0] as { subject: string }; - const otp = mail.subject.match(/\b\d{6}\b/)![0]; - expect((await request("/email-otp/verify-email", { email, otp })).status).toBe(200); - expect((await request("/sign-in/email", { email, password })).status).toBe(200); - expect(await db.select().from(schema.user).where(eq(schema.user.email, email))).toHaveLength(1); -}, 30_000); diff --git a/apps/api/test/modules/deployments/build-duration.test.ts b/apps/api/test/modules/deployments/build-duration.test.ts index 8d1e2cecb..026f4db36 100644 --- a/apps/api/test/modules/deployments/build-duration.test.ts +++ b/apps/api/test/modules/deployments/build-duration.test.ts @@ -13,6 +13,7 @@ vi.mock("@repo/platform/engine/lib/notification-dispatcher", () => ({ notification: { emit: vi.fn() }, })); vi.mock("@repo/platform/engine/lib/audit-emitter", () => ({ audit: { recordAsync: vi.fn() } })); +vi.mock("@repo/platform/engine/lib/favicon-detector", () => ({ detectAndStoreFavicon: vi.fn() })); vi.mock("@repo/platform/engine/modules/mail/webmail/webmail-install.service", () => ({ onWebmailDeployed: vi.fn(), })); diff --git a/apps/api/test/modules/deployments/compose-host-channel-notice.test.ts b/apps/api/test/modules/deployments/compose-host-channel-notice.test.ts index 83322bdd5..58861d410 100644 --- a/apps/api/test/modules/deployments/compose-host-channel-notice.test.ts +++ b/apps/api/test/modules/deployments/compose-host-channel-notice.test.ts @@ -250,7 +250,7 @@ it("deploys Cloud Compose endpoints, internal paths, generated files and contain const configurations: Array> = []; const publishRoute = vi.fn(async () => undefined); const pullImage = vi.fn(async () => undefined); - const resolveRoutingTarget = vi.fn(async (id: string, port: number) => ({ vm: "shared-vm", + const resolveRoutingTarget = vi.fn(async (id: string, port: number) => ({ workspace: "shared-vm", port: id === "web-container" ? (port === 8080 ? 30001 : 30002) : 30003 })); const runtime = Object.assign(Object.create(CloudDockerRuntime.prototype), { name: "docker", workspaceId: "shared-vm", projectId: "p1", unsupportedComposeKeys: new Set(), @@ -314,8 +314,8 @@ it("deploys Cloud Compose endpoints, internal paths, generated files and contain serviceId: "svc-api", allocatedResources: { containerId: "api-container", cpuCores: 2, memoryMb: 2048 }, })); expect(publishRoute).toHaveBeenCalledWith("app.opsh.io", 30001, false, expect.objectContaining({ routes: [ - { match: { path: "/api/", type: "prefix" }, action: { kind: "proxy", vm: "shared-vm", port: 30003 } }, - { match: { path: "/", type: "prefix" }, action: { kind: "proxy", vm: "shared-vm", port: 30001 } }, + { match: { path: "/api/", type: "prefix" }, action: { kind: "proxy", workspace: "shared-vm", port: 30003 } }, + { match: { path: "/", type: "prefix" }, action: { kind: "proxy", workspace: "shared-vm", port: 30001 } }, ] })); }); @@ -1599,8 +1599,7 @@ describe("compose deploy — host channel unavailable", () => { expect(base.deployServiceWorkload).not.toHaveBeenCalled(); }); - it.each([null, "server-original"])("refuses ambiguous duplicate containers on %s before repairing or activating anything", async (serverId) => { - h.previousDeployment.meta = { serverId }; + it("refuses ambiguous duplicate containers before repairing or activating anything", async () => { const base = startingRuntime(); const liveContainer = (id: string, name: string) => ({ id, @@ -1666,18 +1665,11 @@ describe("compose deploy — host channel unavailable", () => { { executor: {} as CommandExecutor, hostPortTarget: localHostPortTarget, - serverId: serverId ?? undefined, }, ), - ).rejects.toMatchObject({ - code: "SERVICE_CONTAINER_CONFLICT", - message: expect.stringMatching(/more than one container matching active service "api".*no service activation/i), - details: { - projectId: "p1", serviceId: "svc-api", serviceName: "api", - containerNames: ["openship-app-api-a", "openship-app-api-b"], - serverId, workspaceId: null, - }, - }); + ).rejects.toThrow( + /more than one container matching active service "api".*no service activation/i, + ); expect(h.updateServiceDeployment).not.toHaveBeenCalled(); expect(h.allocateAndReservePinnedHostPort).not.toHaveBeenCalled(); diff --git a/apps/api/test/modules/deployments/compose-noop-settle.test.ts b/apps/api/test/modules/deployments/compose-noop-settle.test.ts index 7a522fa77..100da4d26 100644 --- a/apps/api/test/modules/deployments/compose-noop-settle.test.ts +++ b/apps/api/test/modules/deployments/compose-noop-settle.test.ts @@ -94,6 +94,7 @@ vi.mock("@repo/platform/engine/lib/notification-dispatcher", () => ({ vi.mock("../../../src/lib/audit", () => ({ audit: { recordAsync: (_c: unknown, e: { eventType: string }) => h.audits.push(e.eventType) }, })); +vi.mock("@repo/platform/engine/lib/favicon-detector", () => ({ detectAndStoreFavicon: async () => {} })); vi.mock("@repo/platform/engine/modules/mail/webmail/webmail-install.service", () => ({ onWebmailDeployed: async () => {}, })); diff --git a/apps/api/test/modules/deployments/deploy-outcome-vs-logs.test.ts b/apps/api/test/modules/deployments/deploy-outcome-vs-logs.test.ts index 52ffd3b75..e847bd792 100644 --- a/apps/api/test/modules/deployments/deploy-outcome-vs-logs.test.ts +++ b/apps/api/test/modules/deployments/deploy-outcome-vs-logs.test.ts @@ -113,6 +113,7 @@ vi.mock("@repo/platform/engine/lib/notification-dispatcher", () => ({ }, })); vi.mock("../../../src/lib/audit", () => ({ audit: { recordAsync: () => {} } })); +vi.mock("@repo/platform/engine/lib/favicon-detector", () => ({ detectAndStoreFavicon: async () => {} })); vi.mock("@repo/platform/engine/modules/mail/webmail/webmail-install.service", () => ({ onWebmailDeployed: async () => {}, })); diff --git a/apps/api/test/modules/deployments/deployment-meta-redaction.test.ts b/apps/api/test/modules/deployments/deployment-meta-redaction.test.ts index ee521b560..3fd2f63b7 100644 --- a/apps/api/test/modules/deployments/deployment-meta-redaction.test.ts +++ b/apps/api/test/modules/deployments/deployment-meta-redaction.test.ts @@ -13,6 +13,7 @@ vi.mock("@repo/platform/engine/lib/notification-dispatcher", () => ({ notification: { emit: vi.fn() }, })); vi.mock("@repo/platform/engine/lib/audit-emitter", () => ({ audit: { recordAsync: vi.fn() } })); +vi.mock("@repo/platform/engine/lib/favicon-detector", () => ({ detectAndStoreFavicon: vi.fn() })); vi.mock("@repo/platform/engine/modules/mail/webmail/webmail-install.service", () => ({ onWebmailDeployed: vi.fn(), })); diff --git a/apps/api/test/modules/deployments/native-sdk-parity.test.ts b/apps/api/test/modules/deployments/native-sdk-parity.test.ts index 4b0e0ec0d..6a1cf68ba 100644 --- a/apps/api/test/modules/deployments/native-sdk-parity.test.ts +++ b/apps/api/test/modules/deployments/native-sdk-parity.test.ts @@ -1897,8 +1897,8 @@ describe("domain and DNS HTTP/native parity", () => { const local = await native(); h.members.set("org-a:alice", { id: "member-a", role: "member" }); for (const dns of [remote().dns, local.dns]) { - await expect(dns.addCredential(input)).rejects.toMatchObject({ code: "NOT_FOUND" }); - await expect(dns.removeCredential("dns-a")).rejects.toMatchObject({ code: "NOT_FOUND" }); + await expect(dns.addCredential(input)).rejects.toMatchObject({ code: "INSUFFICIENT_ROLE" }); + await expect(dns.removeCredential("dns-a")).rejects.toMatchObject({ code: "INSUFFICIENT_ROLE" }); } expect(h.dnsAdd).not.toHaveBeenCalled(); expect(h.dnsRemove).not.toHaveBeenCalled(); @@ -2045,10 +2045,10 @@ describe("provider credential HTTP/native parity", () => { const local = await native(); h.members.set("org-a:alice", { id: "member-a", role: "member" }); for (const credentials of [local.credentials, remote().credentials]) { - await expect(credentials.create({ provider: "docker-registry", name: "Registry", values: { secret: "value" } })).rejects.toMatchObject({ code: "NOT_FOUND" }); - await expect(credentials.update("credential-a", { name: "Renamed" })).rejects.toMatchObject({ code: "NOT_FOUND" }); - await expect(credentials.remove("credential-a")).rejects.toMatchObject({ code: "NOT_FOUND" }); - await expect(credentials.verify("credential-a")).rejects.toMatchObject({ code: "NOT_FOUND" }); + await expect(credentials.create({ provider: "docker-registry", name: "Registry", values: { secret: "value" } })).rejects.toMatchObject({ code: "INSUFFICIENT_ROLE" }); + await expect(credentials.update("credential-a", { name: "Renamed" })).rejects.toMatchObject({ code: "INSUFFICIENT_ROLE" }); + await expect(credentials.remove("credential-a")).rejects.toMatchObject({ code: "INSUFFICIENT_ROLE" }); + await expect(credentials.verify("credential-a")).rejects.toMatchObject({ code: "INSUFFICIENT_ROLE" }); } expect(h.credentialCreate).not.toHaveBeenCalled(); expect(h.credentialUpdate).not.toHaveBeenCalled(); @@ -2492,20 +2492,6 @@ describe("server HTTP/native parity", () => { expect(h.serverRemove).not.toHaveBeenCalled(); }); - it("denies ordinary members host execution through native, SDK and raw HTTP operations", async () => { - h.members.set("org-a:alice", { id: "member-a", role: "member" }); - const local = await native(); - for (const servers of [local.servers, remote().servers]) { - await expect(servers.exec("server-a", { command: "whoami" })).rejects.toMatchObject({ code: "NOT_FOUND" }); - } - const response = await app.request("/api/system/servers/server-a/exec", { - method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ command: "whoami" }), - }); - expect(response.status).toBe(404); - expect(h.serverWithExecutor).not.toHaveBeenCalled(); - expect(h.audit.mock.calls.filter(([event]) => event.eventType === "server.exec")).toHaveLength(0); - }); - it("returns the same partial teardown result and keeps HTTP 409", async () => { h.serverWorkloads.mockResolvedValue([{ id: "project-a", name: "Application", appTemplateId: null }]); h.projectTeardown.mockResolvedValue({ rowDeleted: false, orphaned: [], unrecoverable: [{ error: "volume busy" }] }); @@ -2598,11 +2584,11 @@ describe("HTTP/native system parity", () => { for (const system of [local.system, remote().system]) { await expect(system.updateSettings({ productMode: "mail" })).rejects.toMatchObject({ statusCode: 403 }); await expect(system.updateEmailSettings({ host: null })).rejects.toMatchObject({ statusCode: 403 }); - await expect(system.resetSettings()).rejects.toMatchObject({ statusCode: role === "member" ? 404 : 403 }); + await expect(system.resetSettings()).rejects.toMatchObject({ statusCode: 403 }); await expect(system.health()).rejects.toMatchObject({ statusCode: 403 }); await expect(system.browse({ path: "/" })).rejects.toMatchObject({ statusCode: 403 }); await expect(system.listUntrackedEdgeSites()).rejects.toMatchObject({ statusCode: 403 }); - await expect(system.removeUntrackedEdgeSite({ hostname: "orphan.example.test" })).rejects.toMatchObject({ statusCode: role === "member" ? 404 : 403 }); + await expect(system.removeUntrackedEdgeSite({ hostname: "orphan.example.test" })).rejects.toMatchObject({ statusCode: 403 }); } } expect(h.settingsUpsert).not.toHaveBeenCalled(); diff --git a/apps/api/test/modules/deployments/resource-guidance.test.ts b/apps/api/test/modules/deployments/resource-guidance.test.ts index 68b7f89ee..3e0533151 100644 --- a/apps/api/test/modules/deployments/resource-guidance.test.ts +++ b/apps/api/test/modules/deployments/resource-guidance.test.ts @@ -237,21 +237,3 @@ it("retains resource guidance for a published partial rollout without turning it errorDetails: { resourceIssue: "storage-full" }, }); }); - - -it.each([true, false])("restores a container conflict on a Cloud=%s attempt without relabeling it as capacity", async (cloud) => { - const ctx = await attempt(cloud); - const details = { - projectId: ctx.project.id, - serviceId: "app-service", - containerNames: ["app-current", "app-duplicate"], - serverId: ctx.project.serverId ?? "ssh-original", - workspaceId: ctx.project.workspaceId, - }; - await onFailure(ctx, "More than one container matches the active service", undefined, { - errorCode: "SERVICE_CONTAINER_CONFLICT", errorDetails: details, - }); - expect(await getBuildSessionStatus(ctx.dep.id)).toMatchObject({ - status: "failed", errorCode: "SERVICE_CONTAINER_CONFLICT", errorDetails: details, - }); -}); diff --git a/apps/api/test/modules/deployments/reused-artifact-not-reclaimed.test.ts b/apps/api/test/modules/deployments/reused-artifact-not-reclaimed.test.ts index 5d07a4e0f..5ab30154e 100644 --- a/apps/api/test/modules/deployments/reused-artifact-not-reclaimed.test.ts +++ b/apps/api/test/modules/deployments/reused-artifact-not-reclaimed.test.ts @@ -32,6 +32,9 @@ vi.mock("@repo/platform/engine/lib/notification-dispatcher", () => ({ notification: { emit: vi.fn() }, })); vi.mock("../../../src/lib/audit", () => ({ audit: { recordAsync: vi.fn(), record: vi.fn() } })); +vi.mock("@repo/platform/engine/lib/favicon-detector", () => ({ + detectAndStoreFavicon: vi.fn(async () => {}), +})); vi.mock("@repo/platform/engine/modules/projects/cleanup-keep-set", () => ({ computeCleanupKeepSet: vi.fn(async () => ({ containers: new Set() })), })); diff --git a/apps/api/test/modules/dns/managed-ingress.test.ts b/apps/api/test/modules/dns/managed-ingress.test.ts index 9593efea9..9bc116e4c 100644 --- a/apps/api/test/modules/dns/managed-ingress.test.ts +++ b/apps/api/test/modules/dns/managed-ingress.test.ts @@ -94,6 +94,6 @@ describe("managed ingress through authenticated HTTP and the public SDK", () => headers, body: JSON.stringify({ credentialId: "no-secret" }), }); - expect(denied.status).toBe(404); + expect(denied.status).toBe(403); }); }); diff --git a/apps/api/test/modules/mcp/mcp-tools-filter.test.ts b/apps/api/test/modules/mcp/mcp-tools-filter.test.ts index be9f00362..719dad2d2 100644 --- a/apps/api/test/modules/mcp/mcp-tools-filter.test.ts +++ b/apps/api/test/modules/mcp/mcp-tools-filter.test.ts @@ -135,7 +135,6 @@ function principal( const granted = new Set([...(p.grantedRootTypes ?? []), ...Object.keys(wildcards)]); return { role: p.role ?? "restricted", - membershipRole: p.membershipRole, readOnly: p.readOnly ?? false, grantedRootTypes: granted, wildcardGrants: p.wildcardGrants ?? new Map(Object.entries(wildcards)), @@ -148,16 +147,6 @@ function principal( const RWA: Permission[] = ["read", "write", "admin"]; describe("filterToolsForPrincipal", () => { - it("hides server administration from members and their existing scoped tokens", () => { - const read = tool({ name: "server_read", method: "GET", perm: { root: "server", leaf: "server", grantRoot: "server", action: "read", wildcard: false } }); - const exec = tool({ name: "server_exec", method: "POST", perm: { root: "server", leaf: "server", grantRoot: "server", action: "admin", wildcard: false } }); - for (const caller of [ - principal({ role: "member" }), - principal({ role: "restricted", membershipRole: "member", grantedRootTypes: new Set(["server"]), wildcards: { server: RWA } }), - ]) expect(names(filterToolsForPrincipal([read, exec], caller))).toEqual(["server_read"]); - expect(names(filterToolsForPrincipal([read, exec], principal({ role: "admin" })))).toEqual(["server_exec", "server_read"]); - }); - it("owner sees everything", () => { const out = filterToolsForPrincipal(ALL, principal({ role: "owner" })); expect(out.length).toBe(ALL.length); diff --git a/apps/api/test/modules/mcp/mcp-workspaces.test.ts b/apps/api/test/modules/mcp/mcp-workspaces.test.ts index 8179cc373..80dbb98b3 100644 --- a/apps/api/test/modules/mcp/mcp-workspaces.test.ts +++ b/apps/api/test/modules/mcp/mcp-workspaces.test.ts @@ -138,22 +138,6 @@ describe("MCP workspace discovery", () => { expect(denied.isError).toBe(true); }); - it.each([false, true])("advertises administration in another workspace only for an unbound credential (bound=%s)", async bound => { - const owner = await seedOwner({ bound }); - await secondWorkspace(owner, "admin"); - await db.update(schema.member).set({ role: "member" }).where(and(eq(schema.member.userId, owner.userId), eq(schema.member.organizationId, owner.orgId))); - const listed = await (await rpc(owner, "tools/list")).json() as { result: { tools: { name: string }[] } }; - expect(listed.result.tools.some(tool => tool.name === "delete_projects_by_id")).toBe(!bound); - if (!bound) { - const group = await repos.projectGroup.create({ organizationId: owner.orgId, name: "Member project", slug: "member-project" }); - const project = await repos.project.create({ organizationId: owner.orgId, groupId: group.id, name: "Member project", slug: "member-project" }); - const denied = await call(owner, "delete_projects_by_id", { id: project.id, organizationId: owner.orgId }); - expect(denied).toMatchObject({ isError: true, data: { code: "NOT_FOUND" } }); - expect(forwarding.fetch).toHaveBeenCalled(); - expect(await repos.project.findById(project.id)).toMatchObject({ id: project.id }); - } - }); - it("shares the discovery contract with SDKs and respects fixed native scopes", async () => { const owner = await seedOwner({ bound: false }); const target = await secondWorkspace(owner); diff --git a/apps/api/test/modules/migration/platform-import-domains.test.ts b/apps/api/test/modules/migration/platform-import-domains.test.ts deleted file mode 100644 index 26c5800b8..000000000 --- a/apps/api/test/modules/migration/platform-import-domains.test.ts +++ /dev/null @@ -1,185 +0,0 @@ -import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; -import { db, eq, repos, schema, type Service } from "@repo/db"; -import type { ExecutionContext } from "@repo/platform"; -import type { PlannedImportService } from "@repo/platform/engine/modules/migration/platform-import-plan"; -import { platformImportRoutes } from "@repo/platform/engine/modules/migration/platform-import-project"; -import { saveMigrationRoutes } from "@repo/platform/engine/modules/migration/migration-routes"; -import { seedOrg, seedProject, seedService } from "../../helpers/seed"; - -const live = vi.hoisted(() => ({ reconcile: vi.fn() })); -vi.mock("@repo/platform/engine/lib/route-apply.service", async (original) => ({ - ...(await original()), - reconcileProjectRoutes: live.reconcile, -})); - -function recipe( - service: Service, - domains: PlannedImportService["source"]["domains"], - data: PlannedImportService["data"] = "empty", -): PlannedImportService { - return { - source: { - id: `source-${service.id}`, - name: "Provider name", - kind: "app", - domains, - env: {}, - rawEnv: {}, - variables: [], - volumes: [], - warnings: [], - blockers: [], - }, - data, - create: { name: service.name }, - environment: {}, - bindings: [], - }; -} - -describe("provider imports share native pending-domain persistence", () => { - const organizations: string[] = []; - let ctx: ExecutionContext; - beforeEach(async () => { - vi.clearAllMocks(); - ctx = (await seedOrg()) as ExecutionContext; - organizations.push(ctx.organizationId); - }); - afterEach(async () => { - for (const id of organizations.splice(0)) { - await db.delete(schema.project).where(eq(schema.project.organizationId, id)); - await db.delete(schema.servers).where(eq(schema.servers.organizationId, id)); - await db.delete(schema.cloudWorkspace).where(eq(schema.cloudWorkspace.organizationId, id)); - await db.delete(schema.organization).where(eq(schema.organization.id, id)); - } - }); - - it.each(["server", "cloud"])( - "saves custom aliases on their services without verifying or applying live routes (%s)", - async (target) => { - const managed = - target === "cloud" - ? await repos.cloudWorkspace.create({ - organizationId: ctx.organizationId, - name: "Import destination", - }) - : null; - const server = managed - ? await repos.server.findByWorkspace(managed.id, ctx.organizationId) - : null; - const project = await seedProject(ctx.organizationId, { - framework: "docker-compose", - serverId: server?.id, - }); - const web = await seedService(project.id, { - name: "storefront", - ports: ["8080"], - exposed: false, - }); - const api = await seedService(project.id, { - name: "api", - kind: "monorepo", - ports: ["3000"], - exposed: false, - }); - const internal = await seedService(project.id, { - name: "worker", - ports: ["9000"], - exposed: false, - }); - const plans = [ - recipe(web, [ - { hostname: "shop.example.com", portable: true }, - { hostname: "www.example.com", portable: true }, - { hostname: "shop.up.railway.app", portable: false }, - ]), - recipe(api, [ - { hostname: "api.example.com", portable: true }, - { hostname: "api.vercel.app", portable: false }, - ]), - recipe(internal, [{ hostname: "worker.up.railway.app", portable: false }]), - recipe(internal, [{ hostname: "external.example.com", portable: true }], "external"), - ]; - const routes = platformImportRoutes(plans); - await saveMigrationRoutes(ctx, project.id, routes, () => {}); - // Re-saving uses the existing rows, including verification tokens and aliases. - const original = await repos.domain.listByProject(project.id); - await saveMigrationRoutes(ctx, project.id, routes, () => {}); - const domains = await repos.domain.listByProject(project.id); - expect(domains.map((domain) => domain.id).sort()).toEqual( - original.map((domain) => domain.id).sort(), - ); - expect(domains).toHaveLength(3); - for (const [hostname, serviceId, targetPort] of [ - ["shop.example.com", web.id, 8080], - ["www.example.com", web.id, 8080], - ["api.example.com", api.id, 3000], - ] as const) { - const domain = domains.find((item) => item.hostname === hostname)!; - expect(domain).toMatchObject({ - projectId: project.id, - serviceId, - targetPort, - verified: false, - status: "pending", - }); - expect(domain.verificationToken).toBeTruthy(); - expect(domain.verificationToken).toBe( - original.find((item) => item.id === domain.id)?.verificationToken, - ); - } - expect((await repos.service.findById(web.id))?.publicEndpoints).toEqual([ - expect.objectContaining({ port: 8080, customDomain: "shop.example.com" }), - ]); - expect((await repos.project.findById(project.id))?.compositeRoutes).toEqual([ - expect.objectContaining({ - hostname: "www.example.com", - rootServiceId: web.id, - rootPort: 8080, - }), - ]); - expect((await repos.service.findById(internal.id))?.exposed).toBe(false); - expect(live.reconcile).not.toHaveBeenCalled(); - }, - ); - - it("refuses a cross-organization domain before saving any imported route", async () => { - const foreign = (await seedOrg()) as ExecutionContext; - organizations.push(foreign.organizationId); - const existingProject = await seedProject(foreign.organizationId, { - framework: "docker-compose", - }); - const existingService = await seedService(existingProject.id, { - name: "owner", - ports: ["8080"], - }); - await saveMigrationRoutes( - foreign, - existingProject.id, - platformImportRoutes([ - recipe(existingService, [{ hostname: "taken.example.com", portable: true }]), - ]), - () => {}, - ); - const original = await repos.domain.listByProject(existingProject.id); - const project = await seedProject(ctx.organizationId, { framework: "docker-compose" }); - const web = await seedService(project.id, { name: "web", ports: ["8080"], exposed: false }); - await expect( - saveMigrationRoutes( - ctx, - project.id, - platformImportRoutes([ - recipe(web, [ - { hostname: "available.example.com", portable: true }, - { hostname: "taken.example.com", portable: true }, - ]), - ]), - () => {}, - ), - ).rejects.toThrow("already connected to another project"); - expect(await repos.domain.listByProject(project.id)).toEqual([]); - expect((await repos.service.findById(web.id))?.exposed).toBe(false); - expect(await repos.domain.listByProject(existingProject.id)).toEqual(original); - expect(live.reconcile).not.toHaveBeenCalled(); - }); -}); diff --git a/apps/api/test/modules/notifications/notifications-sdk-parity.test.ts b/apps/api/test/modules/notifications/notifications-sdk-parity.test.ts index 06ab6469c..0f616742c 100644 --- a/apps/api/test/modules/notifications/notifications-sdk-parity.test.ts +++ b/apps/api/test/modules/notifications/notifications-sdk-parity.test.ts @@ -133,7 +133,7 @@ describe("notifications shared SDK/HTTP operations", () => { expect(await c.native.listDefaults()).toEqual([value]); expect(await c.native.categories()).toEqual(await c.remote.categories()); await db.update(schema.member).set({ role: "member" }).where(eq(schema.member.userId, owner.userId)); - for (const client of [c.native, c.remote]) await expect(client.upsertDefault({ category: "deploy.failed", defaultEnabled: false })).rejects.toMatchObject({ code: "NOT_FOUND" }); + for (const client of [c.native, c.remote]) await expect(client.upsertDefault({ category: "deploy.failed", defaultEnabled: false })).rejects.toMatchObject({ code: "FORBIDDEN" }); }); it("does not verify a replacement configuration or hide normal delivery failures", async () => { diff --git a/apps/api/test/modules/projects/cloud-promotion-recovery.test.ts b/apps/api/test/modules/projects/cloud-promotion-recovery.test.ts index 10a53e784..a6858b068 100644 --- a/apps/api/test/modules/projects/cloud-promotion-recovery.test.ts +++ b/apps/api/test/modules/projects/cloud-promotion-recovery.test.ts @@ -465,9 +465,8 @@ describe("project promotion recovery", () => { const dump = await dumpSubgraph({ kind: "project", projectId }); const changed = structuredClone(dump); changed.tables.resource_usage.push({ id: "another-sample", projectId, cpu: 42 }); + changed.tables.project[0].favicon = "new favicon"; expect(projectPromotionDigest(changed)).toBe(projectPromotionDigest(dump)); - changed.tables.project[0].iconUrl = "https://cdn.example.test/new-icon.png"; - expect(projectPromotionDigest(changed)).not.toBe(projectPromotionDigest(dump)); changed.tables.project[0].localPath = "/another-source"; expect(projectPromotionDigest(changed)).not.toBe(projectPromotionDigest(dump)); }); diff --git a/apps/api/test/modules/projects/cloud-routing-regression.test.ts b/apps/api/test/modules/projects/cloud-routing-regression.test.ts index a047ea544..a08e2a3ed 100644 --- a/apps/api/test/modules/projects/cloud-routing-regression.test.ts +++ b/apps/api/test/modules/projects/cloud-routing-regression.test.ts @@ -113,7 +113,7 @@ describe("managed Cloud route port edits and repair", () => { await editRoutes(["app.opsh.io"]); expect(h.fixture.pages.create).toHaveBeenCalledOnce(); expect(h.fixture.routes.set).toHaveBeenLastCalledWith("app.opsh.io", expect.objectContaining({ - routes: [{ match: { path: "/", type: "prefix" }, action: { kind: "proxy", vm: h.fixture.workspaceId, port: 32001 } }], + routes: [{ match: { path: "/", type: "prefix" }, action: { kind: "proxy", workspace: h.fixture.workspaceId, port: 32001 } }], })); expect(h.syncManagedEdge).not.toHaveBeenCalled(); }); @@ -124,7 +124,7 @@ describe("managed Cloud route port edits and repair", () => { expect(h.fixture.pages.connectDomain).toHaveBeenCalledWith(expect.any(String), { domain: "app.example.com" }); expect(h.fixture.workspace.network.update).toHaveBeenCalledWith(expect.objectContaining({ ingress_ports: [443, 32000] })); expect(h.fixture.routes.set).toHaveBeenCalledWith("app.example.com", expect.objectContaining({ - routes: expect.arrayContaining([expect.objectContaining({ action: { kind: "proxy", vm: h.fixture.workspaceId, port: 32000 } })]), + routes: expect.arrayContaining([expect.objectContaining({ action: { kind: "proxy", workspace: h.fixture.workspaceId, port: 32000 } })]), })); }); @@ -165,8 +165,8 @@ describe("managed Cloud route port edits and repair", () => { h.domains.push({ ...h.domains[0]!, id: "domain-b", hostname: "console.opsh.io", targetPort: 9000, isPrimary: false }); expect(await retryProjectRouting(h.project.id, h.project.organizationId)).toEqual({ ok: true }); expect(h.fixture.routes.set.mock.calls.map(([host, table]) => [host, table.routes[0]?.action])).toEqual([ - ["app.opsh.io", { kind: "proxy", vm: h.fixture.workspaceId, port: 32000 }], - ["console.opsh.io", { kind: "proxy", vm: h.fixture.workspaceId, port: 32001 }], + ["app.opsh.io", { kind: "proxy", workspace: h.fixture.workspaceId, port: 32000 }], + ["console.opsh.io", { kind: "proxy", workspace: h.fixture.workspaceId, port: 32001 }], ]); }); @@ -196,8 +196,8 @@ describe("managed Cloud route port edits and repair", () => { })); expect(await retryProjectRouting(h.project.id, h.project.organizationId)).toEqual({ ok: true }); expect(h.fixture.routes.set.mock.calls.map(([host, table]) => [host, table.routes[0]?.action])).toEqual([ - ["app.example.com", { kind: "proxy", vm: h.fixture.workspaceId, port: 32000 }], - ["alias.example.com", { kind: "proxy", vm: h.fixture.workspaceId, port: 32000 }], + ["app.example.com", { kind: "proxy", workspace: h.fixture.workspaceId, port: 32000 }], + ["alias.example.com", { kind: "proxy", workspace: h.fixture.workspaceId, port: 32000 }], ]); expect(h.fixture.pages.delete).not.toHaveBeenCalled(); }); diff --git a/apps/api/test/modules/projects/folder-upload.test.ts b/apps/api/test/modules/projects/folder-upload.test.ts index 9cc62e6a2..4360dc34f 100644 --- a/apps/api/test/modules/projects/folder-upload.test.ts +++ b/apps/api/test/modules/projects/folder-upload.test.ts @@ -80,11 +80,11 @@ afterAll(async () => { if (root) await rm(root, { recursive: true, force: true }); }); -async function open(name?: string) { +async function open() { const response = await fetch(`${origin}/api/projects/folder/session`, { method: "POST", headers: { ...owner.auth, "Content-Type": "application/json" }, - body: JSON.stringify({ ...(env.CLOUD_MODE ? { serverId: managedServerId } : {}), ...(name ? { name } : {}) }), + body: JSON.stringify(env.CLOUD_MODE ? { serverId: managedServerId } : {}), }); expect(response.status).toBe(200); const target = (await response.json()) as FolderSessionResult; @@ -117,33 +117,6 @@ function upload(target: FolderSessionResult, bytes = archive, chunked = false) { describe.each([false, true])("authenticated folder upload over HTTP (Cloud: %s)", (cloudMode) => { beforeEach(() => { env.CLOUD_MODE = cloudMode; }); - it.each([undefined, "my-folder-app"])("uses a client name or stable fallback instead of the staging path: %s", async (name) => { - const target = await open(name); - const uploaded = await upload(target); - expect(uploaded.status).toBe(200); - const response = await fetch(`${origin}/api/projects/folder/scan/${target.sessionId}`, { - method: "POST", headers: { ...owner.auth, "Content-Type": "application/json" }, body: "{}", - }); - expect(response.status, await response.clone().text()).toBe(200); - expect(await response.json()).toMatchObject({ name: name ?? "app" }); - }); - - it("returns the safe Compose refusal through the actual folder scan route", async () => { - const source = await mkdtemp(join(root, "host-network-")); - await writeFile(join(source, "compose.yaml"), "services:\n web:\n image: nginx:alpine\n network_mode: host\n"); - const packed = await archiveSourceDirectory(source, { temporaryRoot: join(root, "archives") }); - try { - const target = await open(); - expect((await upload(target, await readFile(packed.path))).status).toBe(200); - const response = await fetch(`${origin}/api/projects/folder/scan/${target.sessionId}`, { - method: "POST", headers: { ...owner.auth, "Content-Type": "application/json" }, body: "{}", - }); - expect(response.status).toBe(400); - expect(await response.json()).toMatchObject({ - code: "COMPOSE_CONFIGURATION_INVALID", error: expect.stringContaining("network_mode"), - }); - } finally { await packed.dispose(); } - }); it.each([false, true])("preserves every byte above 10 MiB (chunked: %s)", async (chunked) => { const target = await open(); const response = await upload(target, archive, chunked); @@ -160,8 +133,7 @@ describe.each([false, true])("authenticated folder upload over HTTP (Cloud: %s)" it("rejects a truncated gzip, cleans temporary files, and allows a complete retry", async () => { const target = await open(); const response = await upload(target, archive.subarray(0, 10 * 1024 * 1024)); - expect(response.status).toBe(400); - expect(await response.json()).toMatchObject({ error: expect.stringMatching(/incomplete|truncated/i) }); + expect(response.status, await response.text()).toBe(400); const session = getFolderSession(target.sessionId)!; expect(session.uploaded).toBe(false); expect(session.uploading).toBe(false); diff --git a/apps/api/test/modules/projects/project-icon.test.ts b/apps/api/test/modules/projects/project-icon.test.ts deleted file mode 100644 index 4cbd56c71..000000000 --- a/apps/api/test/modules/projects/project-icon.test.ts +++ /dev/null @@ -1,58 +0,0 @@ -import "../jobs/_env"; -import { expect, it } from "vitest"; -import { Hono } from "hono"; -import { seedOwner, repos } from "../jobs/_harness"; -import { seedProject, seedDeployment } from "../../helpers/seed"; -import { listDeployments } from "@repo/platform/engine/modules/deployments/deployment.service"; -import { projectRoutes } from "../../../src/modules/projects/project.routes"; -import { handleApiError } from "../../../src/middleware/error-handler"; - -const app = new Hono().onError(handleApiError).route("/api/projects", projectRoutes); - -it("uses one icon URL across authenticated settings, reads and deployment history", async () => { - const owner = await seedOwner(); - const project = await seedProject(owner.orgId); - const custom = "https://cdn.example.test/project.svg"; - const update = (iconUrl: unknown, auth = owner.auth) => - app.request(`/api/projects/${project.id}`, { - method: "PATCH", - headers: { ...auth, "Content-Type": "application/json" }, - body: JSON.stringify({ iconUrl }), - }); - const assertIcon = (data: unknown, expected: string | null) => { - expect(data).toMatchObject({ iconUrl: expected }); - expect(data).not.toHaveProperty("favicon"); - expect(data).not.toHaveProperty("faviconCheckedAt"); - }; - const saved = await update(` ${custom} `); - expect(saved.status, await saved.clone().text()).toBe(200); - assertIcon((await saved.json()).data, custom); - assertIcon(await repos.project.findById(project.id), custom); - const read = await app.request(`/api/projects/${project.id}`, { headers: owner.auth }); - expect(read.status, await read.clone().text()).toBe(200); - assertIcon((await read.json()).data, custom); - await seedDeployment(project); - for (const options of [{ projectId: project.id }, {}]) { - const history = await listDeployments(owner.orgId, options); - assertIcon(history.rows[0], custom); - } - const stranger = await seedOwner(); - expect((await update("https://stranger.example.test/icon.png", stranger.auth)).status).toBe(404); - for (const unsafe of [ - "javascript:alert(1)", - "data:image/png;base64,AAA", - "https://user:password@example.test/i.png", - "/relative.png", - ]) - expect((await update(unsafe)).status).toBe(400); - assertIcon(await repos.project.findById(project.id), custom); - for (const reset of [null, ""]) { - expect((await update(custom)).status).toBe(200); - const cleared = await update(reset); - expect(cleared.status).toBe(200); - assertIcon((await cleared.json()).data, null); - assertIcon(await repos.project.findById(project.id), null); - const history = await listDeployments(owner.orgId, { projectId: project.id }); - assertIcon(history.rows[0], null); - } -}); diff --git a/apps/api/test/modules/projects/project-overview-logs.test.ts b/apps/api/test/modules/projects/project-overview-logs.test.ts index 555e7ddf9..a716386d1 100644 --- a/apps/api/test/modules/projects/project-overview-logs.test.ts +++ b/apps/api/test/modules/projects/project-overview-logs.test.ts @@ -19,6 +19,7 @@ vi.mock("@repo/db", () => ({ repos: { vi.mock("@repo/platform/engine/modules/projects/project.service", () => ({ listProjects: h.list, enrichProjectsBatch: h.enrich, deploymentIsBlocked: () => false })); vi.mock("@repo/platform/engine/lib/authorization", () => ({ authorization: { checkPermissionOnResource: h.canRead, authorize: async (ctx: ExecutionContext) => ctx } })); vi.mock("@repo/platform/engine/lib/cloud/projects", () => ({ fetchOrgCloudProjects: h.cloudProjects })); +vi.mock("@repo/platform/engine/lib/favicon-detector", () => ({ refreshProjectFaviconIfStale: vi.fn() })); vi.mock("@repo/platform/engine/config/index", () => ({ env: h.env })); vi.mock("@repo/platform/engine/lib/oblien-user-client", () => ({ getAdminOblienClient: () => h.env.CLOUD_MODE ? { analytics: { streamToken: h.streamToken, requests: h.requests } } : null })); vi.mock("@repo/platform/engine/lib/cloud/client", () => ({ cloudClient: () => ({ analytics: { streamToken: h.streamToken, requests: h.requests } }) })); diff --git a/apps/api/test/modules/projects/shared-service-connections.test.ts b/apps/api/test/modules/projects/shared-service-connections.test.ts index 1df8a5fb8..fc4d00f0b 100644 --- a/apps/api/test/modules/projects/shared-service-connections.test.ts +++ b/apps/api/test/modules/projects/shared-service-connections.test.ts @@ -66,10 +66,9 @@ beforeEach(() => { describe("connections to a service inside a project", () => { it("offers all eligible projects while excluding the current project and read-only access", async () => { - h.candidates = ["source", "read-only", ...Array.from({ length: 120 }, (_, i) => `consumer-${i}`)].map(id => ({ id, name: id, environmentName: "production", appTemplateId: null, iconUrl: "https://cdn.example.test/icon.svg", framework: "nextjs" })); + h.candidates = ["source", "read-only", ...Array.from({ length: 120 }, (_, i) => `consumer-${i}`)].map(id => ({ id, name: id, environmentName: "production", appTemplateId: null })); const choices = await listConnectionCandidates(ctx, "source"); expect(choices).toHaveLength(120); - expect(choices[0]).toMatchObject({ iconUrl: "https://cdn.example.test/icon.svg", framework: "nextjs" }); expect(choices.some(choice => ["source", "read-only"].includes(choice.id))).toBe(false); expect(h.authorize).toHaveBeenCalledWith(ctx, { resourceType: "project", resourceId: "source", action: "write" }); }); diff --git a/apps/api/test/modules/system/server-exec-authorization.test.ts b/apps/api/test/modules/system/server-exec-authorization.test.ts deleted file mode 100644 index 754a3fcb9..000000000 --- a/apps/api/test/modules/system/server-exec-authorization.test.ts +++ /dev/null @@ -1,48 +0,0 @@ -import "../jobs/_env"; -import { beforeEach, expect, it, vi } from "vitest"; -import { Hono } from "hono"; -import { and, eq } from "@repo/db"; - -const host = vi.hoisted(() => ({ execute: vi.fn(), command: vi.fn() })); -vi.mock("@repo/platform/engine/lib/server-execution", async original => ({ - ...await original(), - withServerExecution: host.execute, -})); -vi.mock("@repo/platform/engine/lib/agent-exec", () => ({ execOnHost: host.command })); - -import { db, schema, seedOwner } from "../jobs/_harness"; -import { serverResourceRoutes } from "../../../src/modules/system/server-resource.routes"; -import { handleApiError } from "../../../src/middleware/error-handler"; - -const app = new Hono().onError(handleApiError).route("/api/system", serverResourceRoutes); -beforeEach(() => { - vi.clearAllMocks(); - host.command.mockResolvedValue({ output: "probe", exitCode: 0, timedOut: false, truncated: false, durationMs: 1 }); - host.execute.mockImplementation(async (_org, _id, work) => work({})); -}); - -it("rejects an authenticated member before host dispatch and preserves administrator execution", async () => { - const actor = await seedOwner(); - const id = `server-${actor.userId}`; - await db.insert(schema.servers).values({ id, organizationId: actor.orgId, name: "Fixture host", sshHost: "203.0.113.10", sshUser: "root" }); - const membership = and(eq(schema.member.userId, actor.userId), eq(schema.member.organizationId, actor.orgId)); - const execute = (serverId = id) => app.request(`/api/system/servers/${serverId}/exec`, { - method: "POST", headers: { ...actor.auth, "Content-Type": "application/json" }, body: JSON.stringify({ command: "id" }), - }); - await db.update(schema.member).set({ role: "member" }).where(membership); - expect((await execute()).status).toBe(404); - expect(host.execute).not.toHaveBeenCalled(); - expect(host.command).not.toHaveBeenCalled(); - await db.update(schema.member).set({ role: "admin" }).where(membership); - expect((await execute()).status).toBe(200); - expect(host.execute).toHaveBeenCalledOnce(); - expect(host.command).toHaveBeenCalledOnce(); - const other = await seedOwner(); - const otherServer = `server-${other.userId}`; - await db.insert(schema.servers).values({ id: otherServer, organizationId: other.orgId, name: "Other organization", sshHost: "203.0.113.11" }); - expect((await execute(otherServer)).status).toBe(404); - expect(host.command).toHaveBeenCalledOnce(); - await db.update(schema.member).set({ role: "member" }).where(membership); - expect((await execute()).status).toBe(404); - expect(host.command).toHaveBeenCalledOnce(); -}); diff --git a/apps/api/test/modules/system/server-managed-controls.test.ts b/apps/api/test/modules/system/server-managed-controls.test.ts index 364e1abd0..aeea020f2 100644 --- a/apps/api/test/modules/system/server-managed-controls.test.ts +++ b/apps/api/test/modules/system/server-managed-controls.test.ts @@ -72,11 +72,11 @@ let workloads: Map; let vm: any; let handle: any; -const jwt = (id = vmId, type = "vm") => +const jwt = (id = vmId, type = "workspace") => `e30.${Buffer.from( JSON.stringify({ type, - vm_id: id, + workspace_id: id, token: runtimeToken, exp: Math.floor(Date.now() / 1000) + 3600, }), @@ -261,8 +261,8 @@ beforeEach(async () => { { ip: "8.8.4.4", countryCode: "US" }, { ip: "1.1.1.1", countryCode: "AU" }, ]), - vms: { get: vi.fn(async () => vm), invalidateRuntime: vi.fn() }, - vm: vi.fn(() => handle), + workspaces: { get: vi.fn(async () => vm), invalidateRuntime: vi.fn() }, + workspace: vi.fn(() => handle), }; h.namespaceClient.mockImplementation(async () => ({ client: h.client, namespace })); h.canWork.mockResolvedValue(undefined); @@ -402,7 +402,7 @@ describe("managed server controls through real HTTP, policy and SQL ownership", ).toBe(400); expect(handle.ssh.setPassword).not.toHaveBeenCalled(); }); - it("reveals only a VM gateway token and fences repeat rotations", async () => { + it("reveals only a workspace gateway token and fences repeat rotations", async () => { const revealed = await request("managed/runtime-api/credential", "POST", { confirm: true }); expect(revealed.status, JSON.stringify(revealed.body)).toBe(200); expect(revealed.body.endpoint).toBe("https://runtime.example.test"); @@ -414,19 +414,12 @@ describe("managed server controls through real HTTP, policy and SQL ownership", "MANAGED_RUNTIME_TOKEN_CHANGED", ); expect(handle.apiAccess.rotateToken).toHaveBeenCalledTimes(1); - expect(h.client.vms.invalidateRuntime).toHaveBeenCalledWith(vmId); + expect(h.client.workspaces.invalidateRuntime).toHaveBeenCalledWith(vmId); handle.apiAccess.getToken.mockResolvedValue({ token: jwt("another-vm") }); expect( (await request("managed/runtime-api/credential", "POST", { confirm: true })).status, ).toBe(502); }); - it.each(["workspace", "namespace", "account"])("rejects %s credentials even with the selected VM ID", async (type) => { - handle.apiAccess.getToken.mockResolvedValue({ token: jwt(vmId, type) }); - const result = await request("managed/runtime-api/credential", "POST", { confirm: true }); - expect(result.status).toBe(502); - expect(result.body.code).toBe("MANAGED_CREDENTIAL_UNAVAILABLE"); - expect(JSON.stringify(result.body)).not.toContain(runtimeToken); - }); it("keeps the original network response for clients that do not request diagnostics", async () => { const legacy = { internetAccess: true, ingressPorts: [80, 9990] }; expect((await request("network-settings")).body).toEqual(legacy); @@ -489,7 +482,7 @@ describe("managed server controls through real HTTP, policy and SQL ownership", "MANAGED_RUNTIME_TOKEN_CHANGED", ); expect(handle.apiAccess.rotateToken).toHaveBeenCalledTimes(1); - expect(h.client.vms.invalidateRuntime).toHaveBeenCalledWith(vmId); + expect(h.client.workspaces.invalidateRuntime).toHaveBeenCalledWith(vmId); const recovered = await request("managed/runtime-api/credential", "POST", { confirm: true }); expect(recovered.status).toBe(200); expect(recovered.body.revision).not.toBe(input.expectedRevision); diff --git a/apps/api/test/modules/tokens/mint-org-binding.test.ts b/apps/api/test/modules/tokens/mint-org-binding.test.ts index b0998efd1..88e421d30 100644 --- a/apps/api/test/modules/tokens/mint-org-binding.test.ts +++ b/apps/api/test/modules/tokens/mint-org-binding.test.ts @@ -188,16 +188,6 @@ beforeEach(() => { }); describe("finding 1: grant width is checked in the org the binding is written to", () => { - it("refuses server administration grants for an ordinary member", async () => { - const grants = [{ resourceType: "server", resourceId: "*", permissions: ["admin"] }]; - const refused = await authorize(OWNER_ORG, { clientId: "cli", organizationId: VICTIM_ORG, grants }); - expect(refused.status).toBe(403); - expect(refused.body.code).toBe("GRANT_EXCEEDS_ACCESS"); - expect(upsertOAuthBindingWithGrants).not.toHaveBeenCalled(); - const allowed = await authorize(OWNER_ORG, { clientId: "cli", organizationId: OWNER_ORG, grants }); - expect(allowed.status).toBe(200); - }); - /** * `billing` and `audit` are the two types `roleAllowsResourceType` denies a * member, and both are grantable — so they isolate "authority comes from the diff --git a/apps/api/tsconfig.json b/apps/api/tsconfig.json index 94a494d7e..7c483898a 100644 --- a/apps/api/tsconfig.json +++ b/apps/api/tsconfig.json @@ -15,6 +15,6 @@ "declaration": false, "declarationMap": false }, - "include": ["src/**/*.ts", "scripts/cloud-readiness.ts"], + "include": ["src/**/*.ts"], "exclude": ["node_modules", "dist"] } diff --git a/apps/cli/package.json b/apps/cli/package.json index f21acbce9..a13d32459 100644 --- a/apps/cli/package.json +++ b/apps/cli/package.json @@ -1,6 +1,6 @@ { "name": "@repo/cli", - "version": "0.9.12", + "version": "0.9.11", "description": "Openship CLI - deploy, manage, and open your Openship platform from the terminal", "license": "Apache-2.0", "repository": { diff --git a/apps/cli/src/commands/domain.ts b/apps/cli/src/commands/domain.ts index 9b6011a8c..5661d5b14 100644 --- a/apps/cli/src/commands/domain.ts +++ b/apps/cli/src/commands/domain.ts @@ -9,7 +9,7 @@ import { exitCommand, rethrowCommandExit } from "../lib/command-exit"; import { Command, Option } from "commander"; import { UploadCertBody, parseInput } from "@repo/contracts"; import { readFileSync } from "node:fs"; -import { prepareCustomDomainEndpoint } from "../lib/custom-domain-endpoint"; +import { attachCustomDomainEndpoint } from "../lib/custom-domain-endpoint"; import { getShipClient } from "../lib/ship-client"; import { spin, fail, confirmOrExit, printResult } from "../lib/cmd-helpers"; import type { Domain, DomainRecords, DomainSsl } from "@repo/sdk/client"; @@ -71,17 +71,14 @@ const addCmd = new Command("add") .argument("", "Domain hostname (e.g. app.example.com)") .requiredOption("-p, --project ", "Project ID to attach the domain to") .option("--primary", "Mark this domain as the project's primary", false) - .option("--service ", "Target service within the selected project") - .option("--port ", "Container port to route (required for ambiguous service ports)", positiveInteger) .action(async (hostname: string, opts) => { const sp = spin(`Adding ${hostname}…`); try { const ship = getShipClient(); - const attach = await prepareCustomDomainEndpoint(ship, opts.project, { service: opts.service, port: opts.port }); const res = await ship.domains.create(opts.project, { hostname, isPrimary: !!opts.primary }); - await attach(res.domain.hostname); + const routed = await attachCustomDomainEndpoint(ship, opts.project, res.domain.hostname); sp?.succeed(`Added ${res.domain.hostname}`); - info(` ${res.domain.hostname} is configured to be routed on the next deploy.`); + if (routed) info(` ${res.domain.hostname} is configured to be routed on the next deploy.`); if (isJsonMode()) { printJson(res); return; diff --git a/apps/cli/src/commands/login.ts b/apps/cli/src/commands/login.ts index fb5e18403..e8da11cd3 100644 --- a/apps/cli/src/commands/login.ts +++ b/apps/cli/src/commands/login.ts @@ -18,7 +18,6 @@ import { fetchCaps } from "../lib/caps"; import { err, info, isJsonMode, ok, printJson } from "../lib/output"; import { exitCommand } from "../lib/command-exit"; import { readSecret } from "../lib/command-input"; -import { discoverPublicInstanceApi } from "../lib/public-instance-api"; export interface LoginOptions { token?: string; @@ -81,7 +80,7 @@ export async function runLogin(options: LoginOptions = {}): Promise { const existing = getContext(contextName); const local = !opts.cloud && !opts.apiUrl && !existing.apiUrl ? localConnectionEndpoints() : undefined; - let apiUrl = opts.cloud ? CLOUD_API_URL : opts.apiUrl || existing.apiUrl || local!.apiUrl; + const apiUrl = opts.cloud ? CLOUD_API_URL : opts.apiUrl || existing.apiUrl || local!.apiUrl; const normalizedApi = new HttpClient({ baseUrl: apiUrl }).apiUrl; const sameEndpoint = existing.apiUrl && new HttpClient({ baseUrl: existing.apiUrl }).apiUrl === normalizedApi; @@ -90,7 +89,7 @@ export async function runLogin(options: LoginOptions = {}): Promise { : opts.dashboardUrl || (sameEndpoint ? existing.dashboardUrl : undefined) || local?.dashboardUrl || - normalizedApi.slice(0, -4).replace(/\/api\/proxy$/, ""); + normalizedApi.slice(0, -4); let token: string | undefined = opts.tokenFile ? readSecret(opts.tokenFile) : opts.token; @@ -133,23 +132,13 @@ export async function runLogin(options: LoginOptions = {}): Promise { // Validate the token against an authenticated endpoint before storing. // 200 → valid; 403 → valid but lacks settings:read scope (still usable). let scoped = false; - for (let attempt = 0; ; attempt++) { - try { - const client = new OpenshipClient({ baseUrl: apiUrl, token, timeoutMs: 8000 }); - await client.tokens.list(); - break; - } catch (error) { - if (error instanceof ApiError && error.status === 403) { - scoped = true; - break; - } - // A missing/non-JSON route can mean the supplied URL is the dashboard. - // An actual authentication refusal must never switch endpoints. - if (attempt === 0 && !opts.cloud && error instanceof ApiError && - (error.status === 404 || error.message === "Invalid JSON response")) { - const discovered = await discoverPublicInstanceApi(apiUrl); - if (discovered) { apiUrl = discovered; continue; } - } + try { + const client = new OpenshipClient({ baseUrl: apiUrl, token, timeoutMs: 8000 }); + await client.tokens.list(); + } catch (error) { + if (error instanceof ApiError && error.status === 403) { + scoped = true; + } else { err( error instanceof ApiError && error.status === 401 ? "Token rejected by the API. Check that it is valid and not revoked." diff --git a/apps/cli/src/commands/service.ts b/apps/cli/src/commands/service.ts index 5243bdc7a..9f830de06 100644 --- a/apps/cli/src/commands/service.ts +++ b/apps/cli/src/commands/service.ts @@ -25,7 +25,6 @@ import { getShipClient, ApiError, hasShipCredentials } from "../lib/ship-client" import { isJsonMode, printJson, printTable, ok, err, info } from "../lib/output"; import { collect, parsePairs, readJsonInput } from "../lib/command-input"; import { fail, confirmOrExit, reportResult, reportExecResult } from "../lib/cmd-helpers"; -import { resolveServiceRef } from "../lib/service-ref"; // ─── Shared helpers ────────────────────────────────────────────────────────── @@ -87,7 +86,19 @@ async function listServices(projectId: string): Promise { /** Resolve a service ref (name or svc_ id) to its row within the stack. */ async function resolveService(projectId: string, ref: string): Promise { - return resolveServiceRef(getShipClient(), projectId, ref); + if (/^svc_/.test(ref)) return getShipClient().services.get(projectId, ref); + const services = await listServices(projectId); + const byId = services.find((s) => s.id === ref); + if (byId) return byId; + const byName = services.filter((s) => s.name === ref); + if (byName.length === 1) return byName[0]; + if (byName.length > 1) { + err(` "${ref}" matches ${byName.length} services — pass the service id (svc_…).`); + exitCommand(1); + } + const known = services.map((s) => s.name).join(", ") || "(none)"; + err(` No service "${ref}" in this stack. Services: ${known}`); + exitCommand(1); } // ─── list / get ─────────────────────────────────────────────────────────────── diff --git a/apps/cli/src/commands/up.ts b/apps/cli/src/commands/up.ts index 5af9fdc1a..51864365e 100644 --- a/apps/cli/src/commands/up.ts +++ b/apps/cli/src/commands/up.ts @@ -11,7 +11,7 @@ import { dirname, join } from "node:path"; import { fileURLToPath } from "node:url"; import { ensureDashboard } from "../lib/dashboard"; -import { installAndStart, serviceHeldPorts } from "../lib/service"; +import { installAndStart } from "../lib/service"; import { composeUp, composePrefetch, @@ -44,7 +44,6 @@ import { LocalExecutor } from "@repo/adapters"; import { resolveInstallInputs, headlessProvision, - provisionInstanceDomain, HeadlessInputError, } from "../lib/instance-provision"; import { mintBareInternalToken } from "../lib/internal-token"; @@ -285,26 +284,6 @@ export const upCommand = new Command("up") if (opts.fromSource || opts.source) return runFromSource(opts); if (opts.foreground) return runForeground(opts); const headless = !!(opts.nonInteractive || opts.yes); - // Validate requested provisioning before pulling images or stopping services. - if (headless || opts.managedEdge) { - try { - if (opts.managedEdge) { - opts.publicUrl = effectivePublicUrl(opts.publicUrl); - if (!opts.publicUrl || new URL(opts.publicUrl).protocol !== "https:") - throw new HeadlessInputError("--managed-edge requires --public-url https://your-domain (or an existing saved HTTPS URL)."); - if (opts.domainKind && opts.domainKind !== "custom") - throw new HeadlessInputError("--managed-edge requires --domain-kind custom."); - if (opts.hostname && opts.hostname !== new URL(opts.publicUrl).hostname) - throw new HeadlessInputError("--hostname must match --public-url when using --managed-edge."); - opts.trustProxy = true; - } - if (headless) upInstallInputs(opts); - } catch (error) { - reportCliMessage("error", (error as Error).message); - process.exit(1); - } - } - // Install method: Compose is the default when it can actually work (Docker on // Linux — the edge container needs host networking); else bare. `planMethod` // owns the decision so `--dry-run` predicts the same one. @@ -340,10 +319,9 @@ export const upCommand = new Command("up") if (!token) { reportCliMessage("warn", chalk.yellow( - "\n Couldn't read the stack's internal token (compose/.env). Run this command as the installation owner (or sudo) to finish admin setup.\n", + "\n Couldn't read the stack's internal token (compose/.env) — create the admin from the dashboard.\n", ), ); - process.exit(1); } else { await runHeadlessProvision( opts, @@ -351,18 +329,6 @@ export const upCommand = new Command("up") { token, method: "compose" }, ); } - } else if (opts.managedEdge) { - const result = await provisionInstanceDomain({ - port: started.apiPort, dashPort: started.dashPort, token: composeInternalToken() ?? undefined, - domain: { kind: "custom", hostname: new URL(opts.publicUrl!).hostname, acmeEmail: opts.acmeEmail, - edge: opts.edge === "takeover" || opts.edge === "migrate" ? opts.edge : "cancel" }, - onLog: message => console.log(chalk.dim(` ${message}`)), - }); - for (const warning of result.warnings) reportCliMessage("warn", warning); - if (!result.domainRegistered) { - reportCliMessage("error", "Managed domain registration did not complete. If this is a new install, run `openship` and choose Create first admin, then retry this command."); - process.exit(1); - } } return; } @@ -370,21 +336,6 @@ export const upCommand = new Command("up") if (headless) await runHeadlessProvision(opts, started, { method: "bare" }); }); -/** Flags and preflight share one provisioning interpretation. */ -function upInstallInputs(opts: UpOpts) { - return resolveInstallInputs({ - adminName: opts.adminName, - adminEmail: opts.adminEmail, - adminPassword: opts.adminPassword, - domainKind: opts.domainKind ?? (opts.managedEdge ? "custom" : undefined), - hostname: opts.hostname, - slug: opts.slug, - publicUrl: opts.publicUrl, - acmeEmail: opts.acmeEmail, - edge: opts.edge, - }); -} - /** * Headless install (bare service): after `startService` installs + supervises * the process, create the admin + register the domain from the flags, so a box @@ -398,7 +349,17 @@ export async function runHeadlessProvision( ): Promise { let inputs; try { - inputs = upInstallInputs(opts); + inputs = resolveInstallInputs({ + adminName: opts.adminName, + adminEmail: opts.adminEmail, + adminPassword: opts.adminPassword, + domainKind: opts.domainKind, + hostname: opts.hostname, + slug: opts.slug, + publicUrl: opts.publicUrl, + acmeEmail: opts.acmeEmail, + edge: opts.edge, + }); } catch (err) { if (err instanceof HeadlessInputError) { reportCliMessage("error", chalk.red(`\n ${err.message}\n`)); @@ -416,10 +377,8 @@ export async function runHeadlessProvision( method: extra?.method, onLog: (m) => console.log(chalk.dim(` ${m}`)), }); - for (const w of result.warnings) reportCliMessage("warn", chalk.yellow(` ⚠ ${w}`)); - if (opts.managedEdge && !result.domainRegistered) - throw new Error("Managed domain registration did not complete. Retry after resolving the domain warning above."); console.log(chalk.green(`\n ✓ Openship provisioned${result.liveUrl ? `: ${result.liveUrl}` : "."}`)); + for (const w of result.warnings) reportCliMessage("warn", chalk.yellow(` ⚠ ${w}`)); } catch (err) { observeCaughtError(err, "cli/commands/up"); reportCliMessage("error", chalk.red(`\n Headless provisioning failed: ${(err as Error).message}\n`)); @@ -682,7 +641,7 @@ async function runCompose(opts: UpOpts & { yes?: boolean }): Promise<{ apiPort: chalk.dim(" Images: api + dashboard + edge (OpenResty on :80/:443)\n") + chalk.dim(" Manage: openship stop · openship update · openship status\n") + // In headless mode the admin is bootstrapped below — don't tell the user to do it by hand. - (headless ? "" : chalk.dim(" Admin setup: run `openship` → Create first admin, or use `openship up --non-interactive --admin-email ` with OPENSHIP_ADMIN_PASSWORD set.\n")), + (headless ? "" : chalk.dim(" Create an admin: open the dashboard and register the first account.\n")), ); return { apiPort: res.apiPort, dashPort: res.dashPort }; } @@ -729,13 +688,9 @@ export async function startService( // No permanent port: switch off any occupied default / flag / remembered port // BEFORE writing the service unit, so the chosen ports are baked into its args. - // A re-run finds our own running service on its ports. installAndStart replaces - // that instance, so they're reclaimable rather than busy; otherwise every re-run - // waited out waitPortFree and then moved the install to new ports (#1570). const resolved = await resolvePorts({ api: opts.port ? Number(opts.port) : undefined, dashboard: opts.dashboardPort ? Number(opts.dashboardPort) : undefined, - reclaimable: await serviceHeldPorts(), }); const port = String(resolved.api); const dashPort = String(resolved.dashboard); diff --git a/apps/cli/src/commands/wizard.ts b/apps/cli/src/commands/wizard.ts index ba716acb0..814fe0f28 100644 --- a/apps/cli/src/commands/wizard.ts +++ b/apps/cli/src/commands/wizard.ts @@ -1231,7 +1231,7 @@ export async function runControl(): Promise { `${chalk.dim("Dashboard".padEnd(11))}${dashUrl}\n` + (ports.api ? `${chalk.dim("API".padEnd(11))}http://localhost:${ports.api}\n` : "") + `${chalk.dim("Manager".padEnd(11))}${managerLabel}`, - "Openship is installed", + "Openship is already set up", ); // Crash-looping on a corrupt DB is the one case where "Start" won't help — @@ -1279,7 +1279,6 @@ export async function runControl(): Promise { : { value: "start", label: "Start the service" }, { value: "stop", label: "Stop the service", hint: "won't restart on boot" }, ...(corrupted ? [] : [{ value: "repair", label: "Repair database", hint: "backup → heal a corrupt DB" }]), - { value: "create-admin", label: "Create first admin", hint: "finish a new install; existing accounts stay intact" }, { value: "reset", label: "Reset admin password", hint: "sets a local email + password login" }, { value: "reconfigure", label: "Re-run setup", hint: "reconfigure domain / cloud / admin" }, { value: "quit", label: "Quit" }, @@ -1288,16 +1287,6 @@ export async function runControl(): Promise { ); switch (action) { - case "create-admin": { - const admin = await promptLocalAdmin(); - const result = await bootstrapAdmin(apiPort, admin); - outro(result.ok - ? result.message === "already-exists" - ? "An admin already exists. Use Reset admin password if you need to recover access." - : `Admin created. Sign in at ${primaryUrl}.` - : `Could not create the admin: ${result.message}`); - return; - } case "repair": { const res = await runRepair(); outro(res.healed ? chalk.green(res.detail) : chalk.yellow(res.detail)); diff --git a/apps/cli/src/lib/custom-domain-endpoint.ts b/apps/cli/src/lib/custom-domain-endpoint.ts index b979265ff..1b1c1a8cf 100644 --- a/apps/cli/src/lib/custom-domain-endpoint.ts +++ b/apps/cli/src/lib/custom-domain-endpoint.ts @@ -1,79 +1,71 @@ -import { firstServicePort, resolveRedirectStatus, safeErrorMessage } from "@repo/core"; +import { safeErrorMessage } from "@repo/core"; import type { UpdateProjectInput } from "@repo/contracts"; import type { CliShipClient } from "./ship-client"; -import { resolveServiceRef } from "./service-ref"; +import { reportCliMessage } from "./output"; type PublicEndpoint = NonNullable[number]; -export interface CustomDomainTarget { service?: string; port?: number } - -/** Validate the target before claiming a hostname, then save through the same - * project/service API used by the dashboard. DNS verification and deployment - * remain explicit subsequent steps. */ -export async function prepareCustomDomainEndpoint( - ship: Pick, - projectId: string, - options: CustomDomainTarget = {}, -): Promise<(hostname: string) => Promise> { - const { project } = await ship.projects.getInfo(projectId); - if (!options.service && project.projectType !== "app") - throw new Error("This is a multi-service project. Pass --service and --port to select its route."); - if (!options.service && project.options.workloadType === "worker") - throw new Error("This worker has no public route. Configure a web workload before adding a domain."); - const service = options.service ? await resolveServiceRef(ship, projectId, options.service) : undefined; - const hasServer = !!service || project.options.hasServer; - const endpoints: PublicEndpoint[] = service?.publicEndpoints?.map(endpoint => ({ ...endpoint, redirectStatus: endpoint.redirectStatus !== undefined ? resolveRedirectStatus(endpoint.redirectStatus) : undefined })) ?? - (service ? [] : (project as typeof project & { publicEndpoints?: PublicEndpoint[] }).publicEndpoints ?? []); - const ports = service ? [...new Set([ - ...(service.ports ?? []).map(spec => firstServicePort([spec])), - ...(service.publicEndpoints ?? []).map(endpoint => endpoint.port), - Number(service.exposedPort), - ].filter((value): value is number => Number.isInteger(value) && Number(value) > 0 && Number(value) <= 65535))] : []; - const port = options.port ?? (service - ? ports.length === 1 ? ports[0] : undefined - : Number(project.options.productionPort || project.port)); - if (hasServer && (!Number.isInteger(port) || !port || port < 1 || port > 65535)) - throw new Error("Choose a valid container port with --port <1-65535>; services with multiple ports require an explicit target."); - if (!hasServer && options.port !== undefined) - throw new Error("A static project routes its output directory; --port requires a web service."); - - return async hostname => { - const host = hostname.trim().toLowerCase(); - try { - // Project info adds UI metadata. Send only the accepted save fields, keeping - // every existing target, hostname, redirect, and endpoint position intact. - const publicEndpoints: PublicEndpoint[] = endpoints.map((endpoint) => ({ - ...(endpoint.port !== undefined ? { port: endpoint.port } : {}), - ...(endpoint.targetPath !== undefined ? { targetPath: endpoint.targetPath } : {}), - ...(endpoint.domain !== undefined ? { domain: endpoint.domain } : {}), - ...(endpoint.customDomain !== undefined ? { customDomain: endpoint.customDomain } : {}), - ...(endpoint.domainType !== undefined ? { domainType: endpoint.domainType } : {}), - ...(endpoint.redirectTo !== undefined ? { redirectTo: endpoint.redirectTo } : {}), - ...(endpoint.redirectStatus !== undefined ? { redirectStatus: endpoint.redirectStatus } : {}), - })); - const endpoint = { domainType: "custom" as const, customDomain: host, ...(hasServer ? { port } : { targetPath: "/" }) }; - const index = publicEndpoints.findIndex(value => value.customDomain?.toLowerCase() === host); - if (index >= 0) { - if (options.port === undefined || publicEndpoints[index]!.port === port) return; - publicEndpoints[index] = { ...publicEndpoints[index], ...endpoint }; - } else publicEndpoints.push(endpoint); - if (service) await ship.services.update(projectId, service.id, { exposed: true, publicEndpoints }); - else await ship.projects.update(projectId, { publicEndpoints }); - } catch (error) { - throw new Error( - `Domain ${host} row still exists, but attaching its route failed: ${safeErrorMessage(error)}. Retry in the dashboard project ${projectId} Domains tab: configure this domain's target and save.`, - { cause: error }, - ); - } - }; -} - -/** Existing callers claim a domain before attaching its endpoint. */ +/** Attach the routing endpoint after claiming the domain, as the dashboard does. */ export async function attachCustomDomainEndpoint( - ship: Pick, + ship: Pick, projectId: string, hostname: string, ): Promise { - await (await prepareCustomDomainEndpoint(ship, projectId))(hostname); - return true; + const host = hostname.trim().toLowerCase(); + try { + const { project } = await ship.projects.getInfo(projectId); + const endpoints = + (project as typeof project & { publicEndpoints?: PublicEndpoint[] }).publicEndpoints ?? []; + if (endpoints.some((endpoint) => endpoint.customDomain?.toLowerCase() === host)) return true; + + if (project.options.workloadType === "worker") { + reportCliMessage( + "warn", + `Domain ${host} was added, but this worker has no public route. Configure a web workload and port before attaching it.`, + ); + return false; + } + + if (project.projectType !== "app") { + reportCliMessage( + "warn", + `Domain ${host} was added, but ${project.name || projectId} is a multi-service project, so routes belong to a service. Attach it to a service in the dashboard.`, + ); + return false; + } + + const hasServer = project.options.hasServer; + const port = Number(project.options.productionPort || project.port); + if (hasServer && (!Number.isInteger(port) || port < 1 || port > 65535)) { + reportCliMessage( + "warn", + `Domain ${host} was added, but the project has no valid server port and no public route. Configure a port in the dashboard Domains tab.`, + ); + return false; + } + + // Project info adds UI metadata. Send only the accepted save fields, keeping + // every existing target, hostname, redirect, and endpoint position intact. + const publicEndpoints: PublicEndpoint[] = endpoints.map((endpoint) => ({ + ...(endpoint.port !== undefined ? { port: endpoint.port } : {}), + ...(endpoint.targetPath !== undefined ? { targetPath: endpoint.targetPath } : {}), + ...(endpoint.domain !== undefined ? { domain: endpoint.domain } : {}), + ...(endpoint.customDomain !== undefined ? { customDomain: endpoint.customDomain } : {}), + ...(endpoint.domainType !== undefined ? { domainType: endpoint.domainType } : {}), + ...(endpoint.redirectTo !== undefined ? { redirectTo: endpoint.redirectTo } : {}), + ...(endpoint.redirectStatus !== undefined ? { redirectStatus: endpoint.redirectStatus } : {}), + })); + publicEndpoints.push({ + domainType: "custom", + customDomain: host, + ...(hasServer ? { port } : { targetPath: "/" }), + }); + await ship.projects.update(projectId, { publicEndpoints }); + return true; + } catch (error) { + throw new Error( + `Domain ${host} row still exists, but attaching its route failed: ${safeErrorMessage(error)}. Retry in the dashboard project ${projectId} Domains tab: configure this domain's target and save.`, + { cause: error }, + ); + } } diff --git a/apps/cli/src/lib/host-channel-preflight.ts b/apps/cli/src/lib/host-channel-preflight.ts index dd88c8dbf..b1ae9370e 100644 --- a/apps/cli/src/lib/host-channel-preflight.ts +++ b/apps/cli/src/lib/host-channel-preflight.ts @@ -188,7 +188,7 @@ async function realProbe(host: string, port: number): Promise { "-e", `OPENSHIP_PROBE_PORT=${port}`, "api", - "node", + "bun", "-e", PROBE_SCRIPT, ], diff --git a/apps/cli/src/lib/instance-provision.ts b/apps/cli/src/lib/instance-provision.ts index 33b13c440..b9801ebc7 100644 --- a/apps/cli/src/lib/instance-provision.ts +++ b/apps/cli/src/lib/instance-provision.ts @@ -268,6 +268,8 @@ export async function headlessProvision(opts: { }): Promise { const { port, inputs, token } = opts; const log = opts.onLog ?? (() => {}); + const warnings: string[] = []; + log("Waiting for the API to become healthy…"); if (!(await waitHealthy(port))) { throw new HeadlessInputError("The API did not become healthy in time — check `openship logs`."); @@ -277,24 +279,8 @@ export async function headlessProvision(opts: { const admin = await bootstrapOrReset(port, inputs.admin, token); if (!admin.ok) throw new HeadlessInputError(`Could not create the admin account: ${admin.message}`); - return { adminReady: true, ...await provisionInstanceDomain({ ...opts, domain: inputs.domain }) }; -} - -/** Register routing independently of credentials, including managed-edge - * re-runs on an already initialized Compose install. */ -export async function provisionInstanceDomain(opts: { - port: string; - dashPort?: string; - domain: InstallInputs["domain"]; - token?: string; - onLog?: (msg: string) => void; - onSlugTaken?: (taken: string) => Promise; -}): Promise> { - const { port, token } = opts; - const log = opts.onLog ?? (() => {}); - const warnings: string[] = []; const dashPort = opts.dashPort ? Number(opts.dashPort) : undefined; - const d = opts.domain; + const d = inputs.domain; let liveUrl: string | undefined; let domainRegistered = false; @@ -406,5 +392,5 @@ export async function provisionInstanceDomain(opts: { } } - return { domainRegistered, liveUrl, warnings }; + return { adminReady: true, domainRegistered, liveUrl, warnings }; } diff --git a/apps/cli/src/lib/public-instance-api.ts b/apps/cli/src/lib/public-instance-api.ts deleted file mode 100644 index 6df441097..000000000 --- a/apps/cli/src/lib/public-instance-api.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { SDK_CAPABILITIES } from "@repo/contracts"; -import { HttpClient } from "@repo/sdk/client"; - -/** A public dashboard may mount the API beneath /api/proxy. Probe without - * credentials and never follow redirects or infer another origin. */ -export async function discoverPublicInstanceApi(baseUrl: string): Promise { - const base = new HttpClient({ baseUrl }).apiUrl.slice(0, -4); - if (/\/(?:api|api\/proxy)$/.test(new URL(baseUrl).pathname.replace(/\/+$/, ""))) return null; - const candidate = `${base}/api/proxy`; - try { - const response = await fetch(`${candidate}/api/health`, { - headers: { Accept: "application/json" }, redirect: "error", signal: AbortSignal.timeout(3_000), - }); - if (!response.ok) return null; - const health = await response.json() as { status?: string; sdk?: { protocol?: number } }; - return health?.status === "ok" && health.sdk?.protocol === SDK_CAPABILITIES.protocol ? candidate : null; - } catch { - // diagnostics-ignore: Optional credential-free discovery; keep the original login failure when this probe cannot identify an API. - return null; - } -} diff --git a/apps/cli/src/lib/service-ref.ts b/apps/cli/src/lib/service-ref.ts deleted file mode 100644 index 619ebbc17..000000000 --- a/apps/cli/src/lib/service-ref.ts +++ /dev/null @@ -1,13 +0,0 @@ -import type { CliShipClient } from "./ship-client"; - -/** Resolve only within the selected project; never fall back to another stack. */ -export async function resolveServiceRef(ship: Pick, projectId: string, ref: string) { - if (/^svc_/.test(ref)) return ship.services.get(projectId, ref); - const services = await ship.services.list(projectId); - const byId = services.find(service => service.id === ref); - if (byId) return byId; - const matches = services.filter(service => service.name === ref); - if (matches.length === 1) return matches[0]!; - if (matches.length > 1) throw new Error(`"${ref}" matches ${matches.length} services — pass the service id (svc_…).`); - throw new Error(`No service "${ref}" in this stack. Services: ${services.map(service => service.name).join(", ") || "(none)"}`); -} diff --git a/apps/cli/src/lib/service.ts b/apps/cli/src/lib/service.ts index 254594a1c..b807497ba 100644 --- a/apps/cli/src/lib/service.ts +++ b/apps/cli/src/lib/service.ts @@ -15,7 +15,6 @@ import { spawnSync } from "node:child_process"; import { existsSync, mkdirSync, writeFileSync, rmSync, readFileSync } from "node:fs"; import { homedir } from "node:os"; import { join, resolve } from "node:path"; -import { LocalExecutor, probeListeningPortOwners } from "@repo/adapters"; import { readCliInstall } from "./cli-install"; import { IS_ALT_HOME, LOG_DIR, OS_DIR } from "./paths"; @@ -391,50 +390,6 @@ export function serviceStatus(): { kind: ServiceKind; installed: boolean; runnin return { kind, installed: false, running: false }; } -/** Only reclaim remembered listeners owned by the installed service's process tree. - * A saved port alone proves no ownership (for example, after `up --no-ui`). - * Unknown service PIDs or incomplete listener ownership use normal port resolution. */ -export async function serviceHeldPorts(): Promise { - const kind = detectKind(); - let pid: number | null = null; - if (kind === "launchd") pid = launchdPid(); - else if (kind === "systemd-user" || kind === "systemd-system") { - const args = kind === "systemd-user" ? ["--user"] : []; - const result = run("systemctl", [...args, "show", SYSTEMD_NAME, "--property=MainPID", "--value"]); - if (result.ok && /^\d+$/.test(result.out)) pid = Number(result.out); - } - // Scheduled Tasks do not expose an authoritative process ID through schtasks. - if (!pid || !Number.isSafeInteger(pid) || pid <= 1) return []; - const processes = run("ps", ["-axo", "pid=,ppid="]); - if (!processes.ok) return []; - const parents = new Map(); - for (const line of processes.out.split("\n")) { - const match = line.match(/^\s*(\d+)\s+(\d+)\s*$/); - if (match) parents.set(Number(match[1]), Number(match[2])); - } - if (!parents.has(pid)) return []; - const belongsToService = (owner: number | null): boolean => { - const seen = new Set(); - while (owner != null && owner > 1 && !seen.has(owner)) { - if (owner === pid) return true; - seen.add(owner); - owner = parents.get(owner) ?? null; - } - return false; - }; - const stored = readStoredPorts(); - const ports = [...new Set([stored?.api, stored?.dashboard])].filter( - (port): port is number => typeof port === "number" && Number.isInteger(port) && port > 0 && port <= 65535, - ); - const executor = new LocalExecutor(); - const held = await Promise.all(ports.map(async (port) => { - const owners = await probeListeningPortOwners(executor, port); - return owners.checked && owners.ownershipComplete && owners.occupants.length > 0 && - owners.occupants.every((owner) => belongsToService(owner.pid)) ? port : null; - })); - return held.filter((port): port is number => port !== null); -} - /** Stop AND disable the service — it won't restart or return on reboot. */ /** * Best-effort reaper for processes still holding our canonical API/dashboard diff --git a/apps/cli/src/lib/up-plan.ts b/apps/cli/src/lib/up-plan.ts index 119d75a95..ee9d9f6c6 100644 --- a/apps/cli/src/lib/up-plan.ts +++ b/apps/cli/src/lib/up-plan.ts @@ -30,7 +30,7 @@ import { previewHostEdge, type EdgePreview } from "./edge-preflight"; import { DEFAULT_REPO, SOURCE_CHECKOUT_DIR, SOURCE_DIST_DIR } from "./from-source"; import { AUTH_SECRET_FILE, DATA_DIR, INTERNAL_TOKEN_FILE, LOG_DIR } from "./paths"; import { PORTS_FILE, resolvePorts, type ResolvedPorts } from "./ports"; -import { installStepFor, preview as previewService, serviceHeldPorts, type ServiceKind } from "./service"; +import { installStepFor, preview as previewService, type ServiceKind } from "./service"; /** How `up` would run: install a supervised service, or stay attached. */ export type UpMode = "service" | "foreground" | "from-source"; @@ -136,7 +136,6 @@ export async function planUp(opts: UpPlanOpts): Promise { { api: opts.port ? Number(opts.port) : undefined, dashboard: opts.dashboardPort ? Number(opts.dashboardPort) : undefined, - reclaimable: mode === "service" ? await serviceHeldPorts() : [], }, { persist: false }, ), diff --git a/apps/cli/test/e2e/domain.test.ts b/apps/cli/test/e2e/domain.test.ts index cae63fd24..e1d2405cf 100644 --- a/apps/cli/test/e2e/domain.test.ts +++ b/apps/cli/test/e2e/domain.test.ts @@ -86,9 +86,9 @@ describe("openship domain add", () => { : { status: 201, json: ADDED }); const { err, code } = await runCommand(domainCommand, ["add", "app.example.com", "-p", "prj1"]); expect(code).toBe(0); - const creation = fetchStub.calls.find(call => call.method === "POST")!; - expect(creation.url).toBe(`${API}/domains`); - expect(creation.body).toEqual({ projectId: "prj1", hostname: "app.example.com", isPrimary: false }); + expect(fetchStub.calls[0].method).toBe("POST"); + expect(fetchStub.calls[0].url).toBe(`${API}/domains`); + expect(fetchStub.calls[0].body).toEqual({ projectId: "prj1", hostname: "app.example.com", isPrimary: false }); expect(err).toContain("openship domain verify d9"); // next-step hint names the new id }); @@ -99,7 +99,7 @@ describe("openship domain add", () => { ? { json: { data: projectInfo.project } } : { status: 201, json: ADDED }); await runCommand(domainCommand, ["add", "app.example.com", "-p", "prj1", "--primary"]); - expect(fetchStub.calls.find(call => call.method === "POST")!.body).toMatchObject({ isPrimary: true }); + expect(fetchStub.calls[0].body).toMatchObject({ isPrimary: true }); }); it("emits the domain and its DNS records as JSON in json mode", async () => { diff --git a/apps/cli/test/e2e/host-channel-container.test.ts b/apps/cli/test/e2e/host-channel-container.test.ts deleted file mode 100644 index 0a202d7f3..000000000 --- a/apps/cli/test/e2e/host-channel-container.test.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { describe, expect, it } from "vitest"; -import { checkHostChannel } from "../../src/lib/host-channel-preflight"; - -// Requires an installed Compose stack with a configured, reachable host SSH channel. -// Run with OPENSHIP_TEST_HOST_CHANNEL=1; never change the host firewall. -describe.skipIf(process.env.OPENSHIP_TEST_HOST_CHANNEL !== "1")("host channel in the API image", () => { - it("reaches the configured host from the actual API container", async () => { - const result = await checkHostChannel(); - expect(result.configured).toBe(true); - expect(result.code).toBe("open"); - }); - - it("distinguishes a refused connection from an unavailable probe", async () => { - const result = await checkHostChannel({ - channel: () => ({ host: "127.0.0.1", port: 1, user: "unused" }), - }); - expect(result.code).toBe("refused"); - }); -}); diff --git a/apps/cli/test/e2e/login.test.ts b/apps/cli/test/e2e/login.test.ts index 1116501fd..b869db092 100644 --- a/apps/cli/test/e2e/login.test.ts +++ b/apps/cli/test/e2e/login.test.ts @@ -48,7 +48,6 @@ vi.mock("../../src/lib/local-connection", () => ({ import { loginCommand } from "../../src/commands/login"; import { CLOUD_API_URL, CLOUD_DASHBOARD_URL, LOCAL_DASHBOARD_URL } from "@repo/core"; -import { SDK_CAPABILITIES } from "@repo/contracts"; import { runCommand, stubFetch, type FetchStub } from "../helpers/harness"; import { setJsonMode } from "../../src/lib/output"; @@ -68,38 +67,6 @@ afterEach(() => { }); describe("openship login endpoint preservation", () => { - it.each([404, 200])("discovers the same-origin API after a dashboard response (%s) and saves it", async (status) => { - fetchStub.restore(); - fetchStub = stubFetch(request => { - if (request.url === "https://ship.example.com/api/tokens") return { status, text: "Dashboard" }; - if (request.url.endsWith("/health")) { - expect(request.headers.authorization).toBeUndefined(); - return { json: { status: "ok", sdk: SDK_CAPABILITIES } }; - } - expect(request.url).toBe("https://ship.example.com/api/proxy/api/tokens"); - expect(request.headers.authorization).toBe("Bearer opsh_pat_test"); - return { json: { data: [] } }; - }); - const result = await runCommand(loginCommand, ["--api-url", "https://ship.example.com", "--token", "opsh_pat_test"]); - expect(result.code).toBe(0); - expect(h.added.at(-1)?.opts).toMatchObject({ apiUrl: "https://ship.example.com/api/proxy", dashboardUrl: "https://ship.example.com" }); - expect(fetchStub.calls).toHaveLength(3); - }); - - it("does not send a token to a guessed endpoint without a valid API health response", async () => { - fetchStub.restore(); - fetchStub = stubFetch(() => ({ status: 404, json: { error: "Not found" } })); - const result = await runCommand(loginCommand, ["--api-url", "https://ship.example.com", "--token", "opsh_pat_test"]); - expect(result.code).toBe(1); - expect(h.added).toEqual([]); - expect(fetchStub.calls.map(call => call.url)).toEqual(["https://ship.example.com/api/tokens", "https://ship.example.com/api/proxy/api/health"]); - expect(fetchStub.calls[1]!.headers.authorization).toBeUndefined(); - }); - - it("derives the dashboard correctly for an explicitly supplied proxy API", async () => { - await runCommand(loginCommand, ["--api-url", "https://ship.example.com/api/proxy", "--token", "opsh_pat_test"]); - expect(h.added.at(-1)?.opts.dashboardUrl).toBe("https://ship.example.com"); - }); it("guides a fresh interactive login to Cloud and opens its token page", async () => { h.interactive = true; const result = await runCommand(loginCommand, []); diff --git a/apps/cli/test/e2e/up.test.ts b/apps/cli/test/e2e/up.test.ts index d1716f857..8ffcf15c7 100644 --- a/apps/cli/test/e2e/up.test.ts +++ b/apps/cli/test/e2e/up.test.ts @@ -207,8 +207,6 @@ beforeEach(() => { (upCommand as any).setOptionValue?.("edge", undefined); (upCommand as any).setOptionValue?.("compose", undefined); (upCommand as any).setOptionValue?.("resetSecrets", undefined); - for (const key of ["managedEdge", "publicUrl", "trustProxy", "nonInteractive", "yes", "adminEmail", "adminPassword", "domainKind", "hostname"]) - upCommand.setOptionValue(key, undefined); con = captureConsole(); }); @@ -220,68 +218,6 @@ afterEach(() => { }); describe("openship up --compose (edge chain)", () => { - it("gives a usable first-admin instruction after an ordinary install", async () => { - const result = await runCommand(upCommand, ["--compose"]); - expect(result.code).toBe(0); - expect(con.text()).toContain("Create first admin"); - expect(con.text()).not.toContain("register the first account"); - }); - - it("refuses incomplete non-interactive setup before changing the stack", async () => { - const result = await runCommand(upCommand, ["--compose", "--non-interactive"]); - expect(result.code).toBe(1); - expect(h.prefetchCalls).toBe(0); - expect(h.composeUpCalls).toBe(0); - expect(con.text()).toContain("--admin-email"); - }); - - it("requires an HTTPS hostname before starting managed-edge installation", async () => { - const result = await runCommand(upCommand, ["--compose", "--managed-edge", "--public-url", "http://ops.example.com"]); - expect(result.code).toBe(1); - expect(h.composeUpCalls).toBe(0); - expect(con.text()).toContain("https://"); - }); - - it("honors managed-edge in Compose without changing admin credentials", async () => { - fetchStub = stubFetch(request => { - expect(request.url).toContain("/api/system/self-register"); - expect(request.body).toMatchObject({ domainType: "custom", hostname: "ops.example.com", dashPort: 3001 }); - return { json: { url: "https://ops.example.com" } }; - }); - const result = await runCommand(upCommand, ["--compose", "--managed-edge", "--public-url", "https://ops.example.com"]); - expect(result.code, result.err).toBe(0); - expect(fetchStub.calls).toHaveLength(1); - expect(fetchStub.calls[0]!.headers["x-internal-token"]).toBe("tok"); - }); - - it("provisions the requested managed domain during headless Compose setup", async () => { - fetchStub = stubFetch(request => { - if (request.url.endsWith("/api/health")) return { json: { status: "ok" } }; - if (request.url.endsWith("/api/system/bootstrap-admin")) return { json: { success: true } }; - expect(request.url).toContain("/api/system/self-register"); - expect(request.body).toMatchObject({ domainType: "custom", hostname: "ops.example.com" }); - return { json: { url: "https://ops.example.com" } }; - }); - const result = await runCommand(upCommand, ["--compose", "--managed-edge", "--public-url", "https://ops.example.com", - "--non-interactive", "--admin-email", "owner@example.com", "--admin-password", "strong-initial-password"]); - expect(result.code, con.text()).toBe(0); - expect(fetchStub.calls.map(call => new URL(call.url).pathname)).toEqual([ - "/api/health", "/api/system/bootstrap-admin", "/api/system/self-register", - ]); - }); - - it("does not report managed-edge success when registration fails", async () => { - fetchStub = stubFetch(request => { - if (request.url.endsWith("/api/health")) return { json: { status: "ok" } }; - if (request.url.endsWith("/api/system/bootstrap-admin")) return { json: { success: true } }; - return { status: 503, json: { error: "Edge unavailable" } }; - }); - const result = await runCommand(upCommand, ["--compose", "--managed-edge", "--public-url", "https://ops.example.com", - "--non-interactive", "--admin-email", "owner@example.com", "--admin-password", "strong-initial-password"]); - expect(result.code).toBe(1); - expect(con.text()).toContain("Managed domain registration did not complete"); - expect(con.text()).not.toContain("✓ Openship provisioned"); - }); it("exits before the edge preflight when docker/compose is missing", async () => { h.hasDocker = false; const r = await runCommand(upCommand, ["--compose"]); diff --git a/apps/cli/test/unit/compose-env-preserve.test.ts b/apps/cli/test/unit/compose-env-preserve.test.ts index 7ea232daa..1ca62a9cd 100644 --- a/apps/cli/test/unit/compose-env-preserve.test.ts +++ b/apps/cli/test/unit/compose-env-preserve.test.ts @@ -1753,13 +1753,10 @@ describe("composeUp — the host channel is provisioned out loud (#509)", () => seedHostKey(); h.channelAuth = () => ({ status: 0, stdout: "openship-sudo=refused\n", stderr: "" }); - // Select a non-root session explicitly: the test runner may itself be root, - // whose SSH login already has privilege and needs no sudo warning. - await composeUp({ hostSshUser: "ops" }); + await composeUp({}); // A working channel, so it IS written — just one with no route to root. expect(writtenEnv().OPENSHIP_HOST_SSH_HOST).toBe("host.docker.internal"); - expect(writtenEnv().OPENSHIP_HOST_SSH_USER).toBe("ops"); expect(warned.join("\n")).toContain("no route to it"); }); diff --git a/apps/cli/test/unit/custom-domain-endpoint.test.ts b/apps/cli/test/unit/custom-domain-endpoint.test.ts index 45f0154c9..39d360423 100644 --- a/apps/cli/test/unit/custom-domain-endpoint.test.ts +++ b/apps/cli/test/unit/custom-domain-endpoint.test.ts @@ -4,8 +4,6 @@ const h = vi.hoisted(() => ({ project: {} as Record, rows: [] as unknown[], updates: [] as unknown[], - services: [] as Array>, - serviceUpdates: [] as unknown[], updateError: false, })); vi.mock("../../src/lib/ship-client", async (importOriginal) => { @@ -32,18 +30,6 @@ vi.mock("../../src/lib/ship-client", async (importOriginal) => { h.updates.push({ id, input }); }, }, - services: { - list: async () => h.services, - get: async (_project: string, id: string) => { - const service = h.services.find(service => service.id === id); - if (!service) throw new Error("Service not found in project"); - return service; - }, - update: async (project: string, id: string, input: unknown) => { - if (h.updateError) throw new Error("update unavailable"); - h.serviceUpdates.push({ project, id, input }); - }, - }, domains: { verify: async () => { throw new Error("verification unavailable"); @@ -73,8 +59,6 @@ beforeEach(() => { h.rows = []; h.updates = []; h.updateError = false; - h.services = []; - h.serviceUpdates = []; }); afterEach(() => vi.restoreAllMocks()); @@ -138,48 +122,28 @@ describe("CLI custom domain routing", () => { expect(h.updates).toEqual([]); }); - it("refuses a portless worker before claiming a domain", async () => { + it("warns without attaching a portless worker or failing the command", async () => { h.project = { ...h.project, hasServer: false, workloadType: "worker", port: null }; + const warning = vi.spyOn(console, "warn").mockImplementation(() => {}); const result = await add(); - expect(result.code).toBe(1); - expect(h.rows).toEqual([]); + expect(result.code).toBe(0); + expect(h.rows).toHaveLength(1); expect(h.updates).toEqual([]); - expect(result.err).toContain("worker has no public route"); + expect(warning.mock.calls.flat().join(" ")).toMatch(/worker.*no public route/i); + expect(result.err).not.toContain("routed on the next deploy"); }); - it.each(["services", "monorepo"])("requires an explicit target before claiming a domain for %s", async projectType => { - h.project = { ...h.project, projectType }; + it.each(["services", "monorepo"])("warns without attaching a %s project", async (projectType) => { + h.project = { ...h.project, name: "My project", projectType }; + const warning = vi.spyOn(console, "warn").mockImplementation(() => {}); const result = await add(); - expect(result.code).toBe(1); - expect(h.rows).toEqual([]); - expect(result.err).toContain("--service"); - }); - - it.each(["web", "svc_web"])("attaches to the project-scoped service selected by %s", async ref => { - h.project.projectType = "services"; - const existing = [{ domainType: "free", domain: "existing", port: 8080 }]; - h.services = [{ id: "svc_web", name: "web", ports: ["8080:3000"], publicEndpoints: existing }]; - const result = await runCommand(domainCommand, ["add", "app.example.com", "-p", "project-1", "--service", ref, "--port", "3000"]); - expect(result.code, result.err).toBe(0); + expect(result.code).toBe(0); + expect(h.rows).toHaveLength(1); expect(h.updates).toEqual([]); - expect(h.serviceUpdates).toEqual([{ project: "project-1", id: "svc_web", input: { exposed: true, publicEndpoints: [...existing, { domainType: "custom", customDomain: "app.example.com", port: 3000 }] } }]); - }); - - it.each(["unknown", "svc_foreign"])("rejects an unknown or foreign service %s before claiming the hostname", async ref => { - h.project.projectType = "services"; - const result = await runCommand(domainCommand, ["add", "app.example.com", "-p", "project-1", "--service", ref, "--port", "3000"]); - expect(result.code).toBe(1); - expect(h.rows).toEqual([]); - expect(h.serviceUpdates).toEqual([]); - }); - - it("requires a port when the selected service has several possible targets", async () => { - h.project.projectType = "services"; - h.services = [{ id: "svc_web", name: "web", ports: ["3000", "3001"] }]; - const result = await runCommand(domainCommand, ["add", "app.example.com", "-p", "project-1", "--service", "web"]); - expect(result.code).toBe(1); - expect(h.rows).toEqual([]); - expect(result.err).toContain("--port"); + expect(warning).toHaveBeenCalledWith( + "Domain app.example.com was added, but My project is a multi-service project, so routes belong to a service. Attach it to a service in the dashboard.", + ); + expect(result.err).not.toContain("routed on the next deploy"); }); it.each(["domain", "edge"])( diff --git a/apps/cli/test/unit/headless-provision-domain.test.ts b/apps/cli/test/unit/headless-provision-domain.test.ts index 435f4132f..dd0e2f7f7 100644 --- a/apps/cli/test/unit/headless-provision-domain.test.ts +++ b/apps/cli/test/unit/headless-provision-domain.test.ts @@ -14,7 +14,6 @@ import { describe, it, expect, beforeEach, vi } from "vitest"; const h = vi.hoisted(() => ({ posts: [] as Array<{ path: string; body: Record }>, - bootstrap: vi.fn(async () => ({ ok: true, message: "created" })), })); vi.mock("../../src/lib/loopback-api", () => ({ @@ -23,13 +22,13 @@ vi.mock("../../src/lib/loopback-api", () => ({ return { ok: true, data: { url: "https://ops.example.com" } }; }, waitHealthy: async () => true, - bootstrapAdmin: h.bootstrap, + bootstrapAdmin: async () => ({ ok: true, message: "created" }), // The provision-stream reader goes through this; unreachable here (the stubbed // self-register returns no sessionId), but the module imports it. internalFetch: async () => ({ kind: "unreachable", detail: "not stubbed" }), })); -import { headlessProvision, provisionInstanceDomain } from "../../src/lib/instance-provision"; +import { headlessProvision } from "../../src/lib/instance-provision"; const inputs = { admin: { email: "a@b.com", name: "a", password: "supersecret" }, @@ -40,16 +39,9 @@ const selfRegister = () => h.posts.find((p) => p.path === "/api/system/self-regi beforeEach(() => { h.posts = []; - h.bootstrap.mockClear(); }); describe("headlessProvision — self-app custom domain", () => { - it("can register a managed domain without creating or resetting an existing admin", async () => { - const result = await provisionInstanceDomain({ port: "4000", dashPort: "3001", domain: inputs.domain }); - expect(result.domainRegistered).toBe(true); - expect(h.bootstrap).not.toHaveBeenCalled(); - expect(h.posts.map(post => post.path)).toEqual(["/api/system/self-register"]); - }); it("requests the custom domain on COMPOSE (container edge issues the cert)", async () => { const res = await headlessProvision({ port: "4000", dashPort: "3001", inputs, method: "compose" }); diff --git a/apps/cli/test/unit/public-instance-api.test.ts b/apps/cli/test/unit/public-instance-api.test.ts deleted file mode 100644 index 89ac6d914..000000000 --- a/apps/cli/test/unit/public-instance-api.test.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { afterEach, expect, it, vi } from "vitest"; -import { SDK_CAPABILITIES } from "@repo/contracts"; -import { discoverPublicInstanceApi } from "../../src/lib/public-instance-api"; -afterEach(() => vi.unstubAllGlobals()); - -it("confines credential-free discovery to the supplied origin and refuses redirects", async () => { - const fetcher = vi.fn(async () => Response.json({ status: "ok", sdk: SDK_CAPABILITIES })); - vi.stubGlobal("fetch", fetcher); - expect(await discoverPublicInstanceApi("https://ship.test/prefix/")).toBe("https://ship.test/prefix/api/proxy"); - expect(fetcher).toHaveBeenCalledWith("https://ship.test/prefix/api/proxy/api/health", expect.objectContaining({ redirect: "error", headers: { Accept: "application/json" } })); -}); -it.each(["https://ship.test/api", "https://ship.test/api/proxy", "https://ship.test/prefix/api/proxy/"])("does not reinterpret an explicit API: %s", async url => { - const fetcher = vi.fn(); vi.stubGlobal("fetch", fetcher); - expect(await discoverPublicInstanceApi(url)).toBeNull(); - expect(fetcher).not.toHaveBeenCalled(); -}); -it.each([{ status: "ok" }, { sdk: SDK_CAPABILITIES }, { status: "ok", sdk: { protocol: -1 } }])("ignores an unrelated health response: %j", async body => { - vi.stubGlobal("fetch", vi.fn(async () => Response.json(body))); - expect(await discoverPublicInstanceApi("https://ship.test")).toBeNull(); -}); diff --git a/apps/cli/test/unit/service-held-ports.test.ts b/apps/cli/test/unit/service-held-ports.test.ts deleted file mode 100644 index 8c90f5dc9..000000000 --- a/apps/cli/test/unit/service-held-ports.test.ts +++ /dev/null @@ -1,111 +0,0 @@ -import { mkdirSync, rmSync, writeFileSync } from "node:fs"; -import { join } from "node:path"; -import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest"; - -const state = vi.hoisted(() => { - const home = `${process.env.TMPDIR || "/tmp"}/openship-service-owners-${process.pid}`; - process.env.OPENSHIP_HOME = home; - return { home, pid: 4200, processes: "4200 1\n4201 4200\n4202 4201\n9000 1", probe: vi.fn() }; -}); -vi.mock("@repo/adapters", () => ({ - LocalExecutor: class {}, - probeListeningPortOwners: state.probe, -})); -vi.mock("../../src/lib/this-host", () => ({ - thisHost: () => ({ profile: { serviceManager: "systemd" } }), -})); -const commands = vi.hoisted(() => vi.fn()); -vi.mock("node:child_process", async (original) => ({ - ...(await original()), - spawnSync: commands, -})); -const { serviceHeldPorts } = await import("../../src/lib/service"); -const platform = process.platform; -beforeEach(() => { - Object.defineProperty(process, "platform", { value: "darwin", configurable: true }); - mkdirSync(state.home, { recursive: true }); - writeFileSync(join(state.home, "ports.json"), JSON.stringify({ api: 7100, dashboard: 7200 })); - state.pid = 4200; - state.processes = "4200 1\n4201 4200\n4202 4201\n9000 1"; - state.probe.mockReset().mockResolvedValue({ - checked: true, - ownershipComplete: true, - occupants: [{ pid: 4202 }], - }); - commands.mockReset().mockImplementation((command, args) => { - const stdout = - command === "launchctl" - ? `"PID" = ${state.pid};` - : command === "systemctl" - ? String(state.pid) - : command === "ps" - ? state.processes - : ""; - return { status: 0, stdout, stderr: "" }; - }); -}); -afterEach(() => - Object.defineProperty(process, "platform", { value: platform, configurable: true }), -); -afterAll(() => rmSync(state.home, { recursive: true, force: true })); - -describe("service-held listener ownership", () => { - it("accepts listeners belonging to the service and nested children", async () => { - expect(await serviceHeldPorts()).toEqual([7100, 7200]); - }); - it("rejects a foreign dashboard listener even while the API service runs", async () => { - state.probe.mockImplementation(async (_, port) => ({ - checked: true, - ownershipComplete: true, - occupants: [{ pid: port === 7100 ? 4201 : 9000 }], - })); - expect(await serviceHeldPorts()).toEqual([7100]); - }); - it("rejects mixed owners, hidden owners and incomplete ownership", async () => { - for (const result of [ - { checked: true, ownershipComplete: true, occupants: [{ pid: 4201 }, { pid: 9000 }] }, - { checked: true, ownershipComplete: false, occupants: [{ pid: 4201 }] }, - { checked: true, ownershipComplete: true, occupants: [{ pid: null }] }, - { checked: false, ownershipComplete: false, occupants: [] }, - ]) { - state.probe.mockResolvedValue(result); - expect(await serviceHeldPorts()).toEqual([]); - } - }); - it("does not trust a saved port when its owner is outside the live service tree", async () => { - state.probe.mockResolvedValue({ - checked: true, - ownershipComplete: true, - occupants: [{ pid: 9000 }], - }); - expect(await serviceHeldPorts()).toEqual([]); - }); - it("falls back when the service is stopped or its process tree is unavailable", async () => { - state.pid = 0; - expect(await serviceHeldPorts()).toEqual([]); - expect(state.probe).not.toHaveBeenCalled(); - state.pid = 4200; - state.processes = "9000 1"; - expect(await serviceHeldPorts()).toEqual([]); - expect(state.probe).not.toHaveBeenCalled(); - }); - it("uses the live systemd MainPID for Linux services", async () => { - Object.defineProperty(process, "platform", { value: "linux", configurable: true }); - expect(await serviceHeldPorts()).toEqual([7100, 7200]); - expect( - commands.mock.calls.some( - ([command, args]) => command === "systemctl" && args.includes("--property=MainPID"), - ), - ).toBe(true); - }); - it("does not guess ownership for a scheduled task without a PID", async () => { - Object.defineProperty(process, "platform", { value: "win32", configurable: true }); - expect(await serviceHeldPorts()).toEqual([]); - expect(state.probe).not.toHaveBeenCalled(); - }); - it("ignores malformed stored ports without invoking an ownership probe", async () => { - writeFileSync(join(state.home, "ports.json"), JSON.stringify({ api: "7100", dashboard: -1 })); - expect(await serviceHeldPorts()).toEqual([]); - expect(state.probe).not.toHaveBeenCalled(); - }); -}); diff --git a/apps/cli/test/unit/up-rerun-ports.test.ts b/apps/cli/test/unit/up-rerun-ports.test.ts deleted file mode 100644 index 51dad16e0..000000000 --- a/apps/cli/test/unit/up-rerun-ports.test.ts +++ /dev/null @@ -1,153 +0,0 @@ -import { mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs"; -import { createServer, type Server } from "node:net"; -import { join } from "node:path"; -import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest"; - -/** - * Re-running `openship up` while its own service is running (#1570). - * - * The running service holds the ports in ports.json, so they probe busy. They are - * still ours: installAndStart replaces that instance before the new one binds. - * Treating them as taken moved the install to new ports on every re-run - * (7100 -> 7101), rewrote ports.json, and first sat out waitPortFree on each port. - */ - -// lib/paths reads OPENSHIP_HOME at import time, so set it before anything loads. -const HOME = vi.hoisted(() => { - const dir = `${process.env.TMPDIR?.replace(/\/$/, "") || "/tmp"}/openship-up-rerun-${process.pid}`; - process.env.OPENSHIP_HOME = dir; - return dir; -}); - -const svc = vi.hoisted(() => ({ - running: false, - heldPorts: [] as number[], - installed: [] as Array<{ port: string; dashboardPort: string }>, -})); - -// Only the service manager is faked. The port resolver and ports.json stay real. -vi.mock("../../src/lib/service", async (importOriginal) => ({ - ...(await importOriginal()), - serviceHeldPorts: async () => (svc.running ? svc.heldPorts : []), - installAndStart: (flags: { port: string; dashboardPort: string }) => { - svc.installed.push(flags); - return { kind: "launchd", detail: "test" }; - }, -})); - -const { startService } = await import("../../src/commands/up"); -const { planUp } = await import("../../src/lib/up-plan"); -const { getFreePort, isPortFree } = await import("../../src/lib/ports"); - -const PORTS_FILE = join(HOME, "ports.json"); -const held: Server[] = []; - -/** Bind a port the way a running process would. */ -function hold(port: number): Promise { - return new Promise((resolve, reject) => { - const srv = createServer(); - srv.once("error", reject); - srv.listen(port, "127.0.0.1", () => { - held.push(srv); - resolve(); - }); - }); -} - -/** A free port whose neighbour is free too, so a move to it would be visible. */ -async function freeWithNeighbour(from?: number): Promise { - for (let i = 0; i < 50; i++) { - const port = from === undefined ? await getFreePort() : from + i * 3; - if ((await isPortFree(port)) && (await isPortFree(port + 1))) return port; - } - throw new Error("no free port with a free neighbour"); -} - -/** API and dashboard ports far enough apart that neither move lands on the other. */ -async function freePorts(): Promise<{ api: number; dashboard: number }> { - const api = await freeWithNeighbour(); - return { api, dashboard: await freeWithNeighbour(api + 10) }; -} - -beforeEach(() => { - mkdirSync(HOME, { recursive: true }); - rmSync(PORTS_FILE, { force: true }); - svc.running = false; - svc.heldPorts = []; - svc.installed = []; -}); - -afterEach(async () => { - await Promise.all(held.splice(0).map((s) => new Promise((r) => s.close(r)))); -}); - -afterAll(() => { - rmSync(HOME, { recursive: true, force: true }); -}); - -describe("startService on a re-run", () => { - it("keeps the ports its own running service holds", async () => { - const { api, dashboard } = await freePorts(); - writeFileSync(PORTS_FILE, JSON.stringify({ api, dashboard })); - await hold(api); - await hold(dashboard); - svc.running = true; - svc.heldPorts = [api, dashboard]; - - const r = await startService({}, { quiet: true }); - - expect({ api: r.port, dashboard: r.dashPort }).toEqual({ - api: String(api), - dashboard: String(dashboard), - }); - expect(svc.installed[0]).toMatchObject({ port: String(api), dashboardPort: String(dashboard) }); - expect(JSON.parse(readFileSync(PORTS_FILE, "utf8"))).toEqual({ api, dashboard }); - }, 30_000); - - it("still moves off a remembered port another program holds when the service is not running", async () => { - const { api, dashboard } = await freePorts(); - writeFileSync(PORTS_FILE, JSON.stringify({ api, dashboard })); - await hold(api); - - const r = await startService({}, { quiet: true }); - - expect(r.port).not.toBe(String(api)); - expect(r.dashPort).toBe(String(dashboard)); - }, 30_000); - - it("moves off an unrelated dashboard listener when the running service owns only the API", async () => { - const { api, dashboard } = await freePorts(); - writeFileSync(PORTS_FILE, JSON.stringify({ api, dashboard })); - await hold(api); - await hold(dashboard); - svc.running = true; - svc.heldPorts = [api]; - const r = await startService({}, { quiet: true }); - expect(r.port).toBe(String(api)); - expect(r.dashPort).not.toBe(String(dashboard)); - }, 30_000); - - it("uses the same owned ports for a dry-run and an actual service rerun", async () => { - const { api, dashboard } = await freePorts(); - writeFileSync(PORTS_FILE, JSON.stringify({ api, dashboard })); - await hold(api); - await hold(dashboard); - svc.running = true; - svc.heldPorts = [api, dashboard]; - const plan = await planUp({ bare: true }); - const r = await startService({}, { quiet: true }); - expect(plan.ports.api).toBe(Number(r.port)); - expect(plan.ports.dashboard).toBe(Number(r.dashPort)); - }, 30_000); - - it("does not reclaim service ports for an attached foreground preview", async () => { - const { api, dashboard } = await freePorts(); - writeFileSync(PORTS_FILE, JSON.stringify({ api, dashboard })); - await hold(api); - svc.running = true; - svc.heldPorts = [api]; - const plan = await planUp({ bare: true, foreground: true }); - expect(plan.ports.api).not.toBe(api); - expect(plan.ports.dashboard).toBe(dashboard); - }, 30_000); -}); diff --git a/apps/dashboard/src/app/(auth)/register/signup-next.test.ts b/apps/dashboard/src/app/(auth)/register/signup-next.test.ts index 2c7ece3a7..e5e61f44d 100644 --- a/apps/dashboard/src/app/(auth)/register/signup-next.test.ts +++ b/apps/dashboard/src/app/(auth)/register/signup-next.test.ts @@ -15,7 +15,7 @@ describe("signUpNext", () => { it("goes to verification when sign-up succeeds WITHOUT a session", () => { // The exact better-auth shape for requireEmailVerification. const next = signUpNext({ data: { token: null } }, opts); - expect(next).toEqual({ kind: "verify", href: "/verify-email?email=a%40b.co&signup=1" }); + expect(next).toEqual({ kind: "verify", href: "/verify-email?email=a%40b.co" }); }); it("treats a missing token field the same as an explicit null", () => { @@ -54,16 +54,3 @@ describe("signUpNext", () => { expect(next.kind === "verify" && next.href).toContain("a%2Btag%40b.co"); }); }); - -it("preserves the Cloud consent and PKCE continuation through signup verification", () => { - const returnTo = "/cloud-authorize?mode=device&state=test-state&code_challenge=test-challenge"; - const next = signUpNext( - { data: { token: null } }, - { email: "existing@example.test", authParams: new URLSearchParams({ returnTo }) }, - ); - expect(next.kind).toBe("verify"); - if (next.kind !== "verify") throw new Error("Expected email continuation"); - const params = new URL(next.href, "https://app.example.test").searchParams; - expect(params.get("signup")).toBe("1"); - expect(params.get("returnTo")).toBe(returnTo); -}); diff --git a/apps/dashboard/src/app/(auth)/register/signup-next.ts b/apps/dashboard/src/app/(auth)/register/signup-next.ts index f7ee49d02..1d77fe8d2 100644 --- a/apps/dashboard/src/app/(auth)/register/signup-next.ts +++ b/apps/dashboard/src/app/(auth)/register/signup-next.ts @@ -23,7 +23,7 @@ export type SignUpResultShape = { export type SignUpNext = /** Show the message; stay on the form. */ | { kind: "error"; message: string | null } - /** No session: privately continue by verification code or sign-in instructions. */ + /** Account exists, no session yet — the code screen, reachable unauthenticated. */ | { kind: "verify"; href: string } /** A real session was issued; follow the post-login destination. */ | { kind: "session"; href: string }; @@ -36,9 +36,7 @@ export function signUpNext( authParams?: Parameters[1]; }, ): SignUpNext { - // The same response also protects an existing address from enumeration. Do - // not promise account creation or a code when the email contains sign-in help. - const verifyHref = `${emailVerificationHref(opts.email, opts.authParams ?? new URLSearchParams())}&signup=1`; + const verifyHref = emailVerificationHref(opts.email, opts.authParams ?? new URLSearchParams()); if (result.error) { // Some deployments surface the requirement as an error instead of a null diff --git a/apps/dashboard/src/app/(auth)/verify-email/page.tsx b/apps/dashboard/src/app/(auth)/verify-email/page.tsx index fd3996605..78944d7c5 100644 --- a/apps/dashboard/src/app/(auth)/verify-email/page.tsx +++ b/apps/dashboard/src/app/(auth)/verify-email/page.tsx @@ -33,11 +33,9 @@ function VerifyEmailContent() { const searchParams = useSearchParams(); const token = searchParams.get("token"); const emailParam = searchParams.get("email") ?? ""; - const fromSignup = searchParams.get("signup") === "1"; const { toast } = useToast(); const { t } = useI18n(); const loginHref = buildAuthPageHref("/login", searchParams); - const resetHref = buildAuthPageHref("/forgot-password", searchParams); const [status, setStatus] = useState<"pending" | "verifying" | "verified" | "error">( token ? "verifying" : "pending", @@ -223,14 +221,11 @@ function VerifyEmailContent() {

- {fromSignup ? t.auth.verifyEmail.signupTitle : t.auth.verifyEmail.pendingTitle} + {t.auth.verifyEmail.pendingTitle}

{emailParam - ? interpolate( - fromSignup ? t.auth.verifyEmail.signupSentTo : t.auth.verifyEmail.pendingSentTo, - { email: emailParam }, - ) + ? interpolate(t.auth.verifyEmail.pendingSentTo, { email: emailParam }) : t.auth.verifyEmail.pendingGeneric}

@@ -269,17 +264,10 @@ function VerifyEmailContent() {

- {t.auth.register.hasAccount}{" "} - {t.auth.register.signIn} + {t.auth.verifyEmail.backToSignIn}

- - {t.auth.forgotPassword.title} - ); diff --git a/apps/dashboard/src/app/(dashboard)/DashboardHomeClient.tsx b/apps/dashboard/src/app/(dashboard)/DashboardHomeClient.tsx index b9513fcc3..138d19258 100644 --- a/apps/dashboard/src/app/(dashboard)/DashboardHomeClient.tsx +++ b/apps/dashboard/src/app/(dashboard)/DashboardHomeClient.tsx @@ -143,7 +143,7 @@ export default function DashboardHomeClient({ ) : (
{sourceProjects.slice(0, 5).map((p) => ( - removeProject(p.id)} /> + removeProject(p.id)} /> ))}
)} diff --git a/apps/dashboard/src/app/(dashboard)/apps/page.tsx b/apps/dashboard/src/app/(dashboard)/apps/page.tsx index 377e5f5f2..4ba8cd845 100644 --- a/apps/dashboard/src/app/(dashboard)/apps/page.tsx +++ b/apps/dashboard/src/app/(dashboard)/apps/page.tsx @@ -184,7 +184,7 @@ export default function AppsPage() {
{filteredApps.length > 0 ? filteredApps.map(app => ( - removeProject(app.id)} /> + removeProject(app.id)} /> )) : (

{copy.catalogNoResults}

)} diff --git a/apps/dashboard/src/app/(dashboard)/deployments/components/DeploymentCard.tsx b/apps/dashboard/src/app/(dashboard)/deployments/components/DeploymentCard.tsx index 92eaf168a..105bd759e 100644 --- a/apps/dashboard/src/app/(dashboard)/deployments/components/DeploymentCard.tsx +++ b/apps/dashboard/src/app/(dashboard)/deployments/components/DeploymentCard.tsx @@ -8,8 +8,10 @@ import { DeploymentMenu } from "./DeploymentMenu"; import { CommitDetailsModal } from "./CommitDetailsModal"; import type { Deployment } from "../types"; import { formatDistanceToNow, formatBuildTime, getStatusConfig } from "../utils"; -import { ProjectIcon } from "@/components/shared/ProjectIcon"; +import { ProjectStackIcon } from "@/components/shared/ProjectStackIcon"; +import { AppLogo } from "@/components/AppLogo"; import { useI18n, interpolate } from "@/components/i18n-provider"; +import { useImageFallback } from "@/hooks/useImageFallback"; type ServiceStatusLabels = { deployed: string; @@ -120,6 +122,7 @@ export const DeploymentCard: React.FC = ({ const { t } = useI18n(); const [isCommitModalOpen, setIsCommitModalOpen] = useState(false); const [isMenuOpen, setIsMenuOpen] = useState(false); + const favicon = useImageFallback(deployment.favicon); const statusConfig = getStatusConfig(deployment.status); const statusLabelMap: Record = { @@ -148,9 +151,21 @@ export const DeploymentCard: React.FC = ({ aria-label={deployment.projectName || t.deployments.card.unknownProject} className="absolute inset-0 z-0" /> - {/* Project icon → catalog logo → framework or service icon */} + {/* App logo (catalog apps) → project favicon → framework icon → initials */}
- + {appTemplateId ? ( + + ) : favicon.showImage ? ( + + ) : ( + + )}
{/* Main info */} diff --git a/apps/dashboard/src/app/(dashboard)/deployments/types.ts b/apps/dashboard/src/app/(dashboard)/deployments/types.ts index a49f53391..213fb5e83 100644 --- a/apps/dashboard/src/app/(dashboard)/deployments/types.ts +++ b/apps/dashboard/src/app/(dashboard)/deployments/types.ts @@ -56,8 +56,9 @@ export interface Deployment { branch?: string; projectId?: string; projectName?: string; - /** Project icon shared with project lists and settings. */ - iconUrl?: string | null; + /** Auto-detected favicon of the deployed site, cached on the project. + * When present it replaces the framework/Docker glyph as the row logo. */ + favicon?: string | null; failureReason?: string; /** Rollback state — populated by the orchestrator-aware listing endpoint. * `artifactRetainedAt` non-null = artifact is archived, rollback-eligible. diff --git a/apps/dashboard/src/app/(dashboard)/deployments/utils.ts b/apps/dashboard/src/app/(dashboard)/deployments/utils.ts index 711c32894..f2bc27c23 100644 --- a/apps/dashboard/src/app/(dashboard)/deployments/utils.ts +++ b/apps/dashboard/src/app/(dashboard)/deployments/utils.ts @@ -41,7 +41,7 @@ export const mapRowToDeployment = (row: any): Deployment => { branch: row.branch ?? undefined, projectId: row.projectId, projectName: row.projectName, - iconUrl: row.iconUrl ?? null, + favicon: row.favicon ?? null, failureReason: row.errorMessage ?? undefined, /* Rollback state — flows from the listing endpoint, which enriches * each row with isActive and surfaces the orchestrator-owned diff --git a/apps/dashboard/src/app/(dashboard)/layout.tsx b/apps/dashboard/src/app/(dashboard)/layout.tsx index cc8c81f0c..abb88ac76 100644 --- a/apps/dashboard/src/app/(dashboard)/layout.tsx +++ b/apps/dashboard/src/app/(dashboard)/layout.tsx @@ -173,9 +173,10 @@ export default async function DashboardLayout({ children }: { children: React.Re hostDomain={deploymentInfo.hostDomain} >
- {/* Full-width update surface. Managed Cloud shows workload security; - Desktop and self-hosted also show installation updates, operator - notices and what's new. Empty state adds no chrome. */} + {/* Update + platform-status surface — full app width, ABOVE the sidebar. + Renders nothing unless there's an advisory / platform notice (SaaS: + partial outage, maintenance) / available update / what's-new, so it + adds no chrome when idle. */} {children}
diff --git a/apps/dashboard/src/app/(dashboard)/projects/[id]/components/AdvancedSettings.tsx b/apps/dashboard/src/app/(dashboard)/projects/[id]/components/AdvancedSettings.tsx index 96b71d21c..fa09be27a 100644 --- a/apps/dashboard/src/app/(dashboard)/projects/[id]/components/AdvancedSettings.tsx +++ b/apps/dashboard/src/app/(dashboard)/projects/[id]/components/AdvancedSettings.tsx @@ -27,7 +27,6 @@ import { isSchemaAppTemplate } from "@/components/app-settings/AppSettingsForm"; import { AppConfiguration } from "./AppConfiguration"; import { BuildSettings } from "./BuildSettings"; import { CloudStaticHosting } from "@/components/project-settings/CloudStaticHosting"; -import { ProjectIconSetting } from "@/components/project-settings/ProjectIconSetting"; interface Props { onDeleteProject: (wipeVolumes?: boolean, recordOnly?: boolean) => void; @@ -358,7 +357,6 @@ export const AdvancedSettings = ({ onDeleteProject }: Props) => { and collided — and since this card has no `overflow-hidden` (the ⋮ menu needs to escape it), the collision spilled into the neighbouring card. */}
-
{ /** One shared editor, accessible here and through workload shortcuts. */ export function ProjectEnvironmentSettings() { - const { id, projectData, servicesData } = useProjectSettings(); + const { id } = useProjectSettings(); const { t } = useI18n(); const [envOpen, setEnvOpen] = useState(false); - const application = projectApplication(projectData, servicesData.services); - const opensApplication = application?.mode === "project" && - !servicesData.services.some((service) => !service.applicationMode); return ( <> - {t.projectDetail.services.detail.tabs.env} - - - ) : ( + actions={ - )} + } /> - {!opensApplication && ( - setEnvOpen(false)} /> - )} + setEnvOpen(false)} /> ); } diff --git a/apps/dashboard/src/app/(dashboard)/projects/[id]/components/DomainSettings.tsx b/apps/dashboard/src/app/(dashboard)/projects/[id]/components/DomainSettings.tsx index 49a48108e..86b8f4391 100644 --- a/apps/dashboard/src/app/(dashboard)/projects/[id]/components/DomainSettings.tsx +++ b/apps/dashboard/src/app/(dashboard)/projects/[id]/components/DomainSettings.tsx @@ -1581,7 +1581,7 @@ export const DomainSettings = ({ applicationScope = false, serviceScope, onRoute // Per-service domains have no endpoint order to reorder — primary is the // domain row's isPrimary flag. Flip it via the API, then reflect locally // (exactly one primary per project). getPrimaryByProject picks this up for - // the project's canonical URL / analytics, and it survives + // the project's canonical URL / favicon / analytics, and it survives // redeploys (service route registration preserves an existing isPrimary). const handleSetPrimaryServiceDomain = async (summary: DomainSummaryItem) => { if (!summary.domainId || summary.isPrimary) return; diff --git a/apps/dashboard/src/app/(dashboard)/projects/[id]/components/UseInProjectModal.test.tsx b/apps/dashboard/src/app/(dashboard)/projects/[id]/components/UseInProjectModal.test.tsx index a4c904295..598bfb73c 100644 --- a/apps/dashboard/src/app/(dashboard)/projects/[id]/components/UseInProjectModal.test.tsx +++ b/apps/dashboard/src/app/(dashboard)/projects/[id]/components/UseInProjectModal.test.tsx @@ -89,7 +89,6 @@ beforeEach(() => { afterEach(async () => { await act(async () => root.unmount()); host.remove(); - vi.restoreAllMocks(); vi.unstubAllGlobals(); }); @@ -107,21 +106,6 @@ async function choose(scope: ParentNode, name: string) { await click(option!); } -it("shows the saved project icon in the connection picker", async () => { - vi.spyOn(HTMLImageElement.prototype, "complete", "get").mockReturnValue(false); - h.candidates.mockResolvedValue({ - data: [{ id: "web", name: "Web app", description: "production", appTemplateId: "redis", iconUrl: "https://cdn.example.test/project.svg" }], - }); - await act(async () => root.render( - , - )); - const dialog = document.querySelector("[data-modal-surface]")!; - await click(dialog.querySelector('[aria-haspopup="listbox"]')!); - const image = document.querySelector('[role="option"] img'); - expect(image?.getAttribute("src")).toBe("https://cdn.example.test/project.svg"); - expect(image?.getAttribute("referrerpolicy")).toBe("no-referrer"); -}); - describe("connection form copy", () => { it("names the count and project, and points at the deployment status, after sharing values", async () => { h.candidates.mockResolvedValue({ diff --git a/apps/dashboard/src/app/(dashboard)/projects/[id]/components/UseInProjectModal.tsx b/apps/dashboard/src/app/(dashboard)/projects/[id]/components/UseInProjectModal.tsx index b0d0c3df0..4975561d6 100644 --- a/apps/dashboard/src/app/(dashboard)/projects/[id]/components/UseInProjectModal.tsx +++ b/apps/dashboard/src/app/(dashboard)/projects/[id]/components/UseInProjectModal.tsx @@ -5,11 +5,10 @@ import { Icon as UiIcon } from "@repo/ui/icons"; import { useEffect, useMemo, useState } from "react"; import { resolveLocalized } from "@repo/core"; -import type { ProjectConnectionCandidate } from "@repo/contracts"; import { Modal } from "@/components/ui/Modal"; import { CustomSelect } from "@/components/ui/CustomSelect"; import { Checkbox } from "@/components/ui/Checkbox"; -import { ProjectIcon } from "@/components/shared/ProjectIcon"; +import { AppLogo } from "@/components/AppLogo"; import { connectionsApi, type ConnectionMode } from "@/lib/api/connections"; import { getApiErrorMessage } from "@/lib/api/client"; import { useToast } from "@/context/ToastContext"; @@ -50,6 +49,15 @@ function InlineHint({ text }: { text: string }) { ); } +interface TargetProject { + id: string; + name: string; + description: string; + appTemplateId?: string; + favicon?: string | null; + clusterId?: string | null; +} + interface ConnectionFormProps { onClose: () => void; hideHeader?: boolean; @@ -96,7 +104,7 @@ export function ProjectConnectionForm({ (!sourceDatabaseId || output.sourceDatabaseId === sourceDatabaseId), ), [suppliedOutputs, view, sourceServiceId, sourceDatabaseId]); - const [targets, setTargets] = useState([]); + const [targets, setTargets] = useState([]); const [loadingProjects, setLoadingProjects] = useState(true); const [targetId, setTargetId] = useState(fixedTargetId ?? ""); const [mode, setMode] = useState(guide?.defaultMode ?? "internal"); @@ -156,7 +164,7 @@ export function ProjectConnectionForm({ setLoadingProjects(true); connectionsApi.candidates(fixedSourceId ?? fixedTargetId ?? "") .then(result => { - if (!cancelled) setTargets(result.data); + if (!cancelled) setTargets(result.data.map(project => ({ ...project, appTemplateId: project.appTemplateId ?? undefined }))); }) .catch(error => { if (!cancelled) setLoadError(getApiErrorMessage(error, c.failed)); }) .finally(() => { if (!cancelled) setLoadingProjects(false); }); @@ -229,7 +237,7 @@ export function ProjectConnectionForm({ label: p.name, description: p.description || undefined, icon: ( - + ), }))} onChange={fixedTargetId ? setSourceProjectId : setTargetId} diff --git a/apps/dashboard/src/app/(dashboard)/projects/[id]/components/environment-scope.test.tsx b/apps/dashboard/src/app/(dashboard)/projects/[id]/components/environment-scope.test.tsx index d0ef8b87c..a60f81f64 100644 --- a/apps/dashboard/src/app/(dashboard)/projects/[id]/components/environment-scope.test.tsx +++ b/apps/dashboard/src/app/(dashboard)/projects/[id]/components/environment-scope.test.tsx @@ -8,7 +8,6 @@ import { ProjectSettingsProvider, useProjectSettings } from "@/context/ProjectSe import { BuildSettings } from "./BuildSettings"; import { AppConfiguration } from "./AppConfiguration"; import { ApplicationSettingsForm } from "@/components/project-settings/ApplicationSettingsForm"; -import { ProjectEnvironmentPanel } from "@/components/project-settings/ProjectEnvironmentPanel"; import { ProjectApplicationPanel } from "./services/ProjectApplicationPanel"; const api = vi.hoisted(() => ({ @@ -270,7 +269,8 @@ describe("project environment access (GH-881)", () => { ])( "rebuilds saved environment changes for $framework on $deployTarget", async ({ framework, ...extra }) => { - await mountProject(framework, , extra); + await mountProject(framework, , extra); + await act(async () => button("Edit").click()); await editInput( [...document.querySelectorAll("input")].find((input) => input.value === "old")!, "new", @@ -293,7 +293,8 @@ describe("project environment access (GH-881)", () => { }, { framework: "docker-compose", deployTarget: "cloud" as const, options: {} }, ])("preserves runtime refresh for $framework on $deployTarget", async ({ framework, ...extra }) => { - await mountProject(framework, , extra); + await mountProject(framework, , extra); + await act(async () => button("Edit").click()); await editInput( [...document.querySelectorAll("input")].find((input) => input.value === "old")!, "new", @@ -306,7 +307,8 @@ describe("project environment access (GH-881)", () => { it("keeps a static site's saved values available when starting the rebuild fails", async () => { api.trigger.mockRejectedValueOnce(new Error("unavailable")); - await mountProject("static", , { options: { workloadType: "static" } }); + await mountProject("static", , { options: { workloadType: "static" } }); + await act(async () => button("Edit").click()); await editInput( [...document.querySelectorAll("input")].find((input) => input.value === "old")!, "new", @@ -327,7 +329,6 @@ describe("project environment access (GH-881)", () => { it.each(["nextjs", "docker-compose"])( "keeps %s Settings reachable and edits shared project inputs without overwriting secrets", async (framework) => { - api.services.mockResolvedValue({ success: true, services: [{ id: "cache", name: "redis", kind: "compose" }] }); await mountProject(framework); expect(host.querySelector('nav a[href$="/advanced"]')).not.toBeNull(); expect(host.textContent).toContain("Project environment"); @@ -399,21 +400,15 @@ describe("permanent configuration ownership", () => { const saved = { id: "project", name: "Test", slug: "test", description: "", framework: "nextjs", runtimeMode: "bare", ...options, port: 3000 }; - it.each([false, true])("opens the correct environment scope from Settings with companions=%s", async (companions) => { + it.each([false, true])("keeps project limits and the shared editor in Settings with companions=%s", async (companions) => { if (companions) api.services.mockResolvedValue({ success: true, services: [{ id: "db", name: "postgres", kind: "compose" }] }); await mountProject("nextjs", , { options }); expect(host.querySelectorAll('section[aria-label="Machine power"]')).toHaveLength(1); expect(host.textContent).toContain("Project environment"); + expect(host.querySelector('a[href$="/application/env"]')).toBeNull(); expect(host.querySelector('a[href$="/application/settings"]')).not.toBeNull(); - if (companions) { - expect(host.querySelector('a[href$="/application/env"]')).toBeNull(); - await act(async () => button("Edit").click()); - expect(document.querySelector('[data-modal-surface] input[value="BUILD_VALUE"]')).not.toBeNull(); - } else { - expect(host.querySelector('a[href="/projects/project/services/application/env"]')?.textContent).toBe("Environment"); - expect(document.querySelector('[data-modal-surface]')).toBeNull(); - expect(api.getEnv).not.toHaveBeenCalled(); - } + await act(async () => button("Edit").click()); + expect(document.querySelector('[data-modal-surface] input[value="BUILD_VALUE"]')).not.toBeNull(); }); it("saves only edited app configuration inline without touching environment or deploying", async () => { diff --git a/apps/dashboard/src/app/(dashboard)/projects/components/ProjectCard.tsx b/apps/dashboard/src/app/(dashboard)/projects/components/ProjectCard.tsx index 85e0967bb..f662bcf33 100644 --- a/apps/dashboard/src/app/(dashboard)/projects/components/ProjectCard.tsx +++ b/apps/dashboard/src/app/(dashboard)/projects/components/ProjectCard.tsx @@ -5,7 +5,8 @@ import { Icon as UiIcon } from "@repo/ui/icons"; import React, { useState } from "react"; import Link from "next/link"; import { type Project } from "@/constants/mock"; -import { ProjectIcon } from "@/components/shared/ProjectIcon"; +import { AppLogo } from "@/components/AppLogo"; +import { ProjectStackIcon } from "@/components/shared/ProjectStackIcon"; import { getFrameworkConfig } from "@/components/import-project/Frameworks"; import { getProjectStatus, projectCardHref, projectDisplayDomain } from "@/utils/project-status"; import { ProjectStatusBadge } from "@/components/shared/ProjectStatusBadge"; @@ -14,6 +15,7 @@ import { useModal } from "@/context/ModalContext"; import { useToast } from "@/context/ToastContext"; import { projectsApi, getApiErrorMessage } from "@/lib/api"; import { timeAgo } from "@/lib/time"; +import { useImageFallback } from "@/hooks/useImageFallback"; import type { Dictionary } from "@/i18n"; /* ── Helpers ──────────────────────────────────────────────────────── */ @@ -48,6 +50,9 @@ interface Props { * every row by the projects list and `/info`, but isn't declared on `Project` * (constants/mock) yet, so it's spelled out here rather than cast away. */ project: Project & { primaryDomain?: string | null }; + /** On the Apps page: show the catalog app's brand logo instead of the + * framework/service fallback icon. */ + preferAppLogo?: boolean; /** Show an "update available" badge (fed by the update scan). Off by default * so the Projects page is unaffected. */ updateAvailable?: boolean; @@ -56,13 +61,14 @@ interface Props { onChanged?: () => void; } -const ProjectCard: React.FC = ({ project, updateAvailable, onChanged }) => { +const ProjectCard: React.FC = ({ project, preferAppLogo, updateAvailable, onChanged }) => { const { t } = useI18n(); const { showModal, hideModal } = useModal(); const { showToast } = useToast(); const [menuOpen, setMenuOpen] = useState(false); const status = getProjectStatus(project); const fw = getFrameworkConfig(project.framework); + const favicon = useImageFallback(project.favicon); const isLocal = !!project.localPath; const hasRepo = !!(project.gitOwner && project.gitRepo); @@ -112,8 +118,22 @@ const ProjectCard: React.FC = ({ project, updateAvailable, onChanged }) =
+ {/* Icon — on the Apps page show the catalog app's brand logo; otherwise + the project favicon, falling back to the framework/service glyph. */}
- + {preferAppLogo && project.isApp ? ( + + ) : favicon.showImage ? ( + + ) : ( + + )}
{/* Name + domain */} diff --git a/apps/dashboard/src/app/(dashboard)/projects/components/ProjectGridCard.tsx b/apps/dashboard/src/app/(dashboard)/projects/components/ProjectGridCard.tsx index f1aaa56c9..66f51f1f7 100644 --- a/apps/dashboard/src/app/(dashboard)/projects/components/ProjectGridCard.tsx +++ b/apps/dashboard/src/app/(dashboard)/projects/components/ProjectGridCard.tsx @@ -6,12 +6,14 @@ import Link from "next/link"; import { useRouter } from "next/navigation"; import DropdownMenu from "@/components/ui/DropdownMenu"; import { type Project } from "@/constants/mock"; -import { ProjectIcon } from "@/components/shared/ProjectIcon"; +import { AppLogo } from "@/components/AppLogo"; +import { ProjectStackIcon } from "@/components/shared/ProjectStackIcon"; import { getProjectStatus, projectCardHref, projectDisplayDomain } from "@/utils/project-status"; import { ProjectStatusBadge } from "@/components/shared/ProjectStatusBadge"; import { ServiceStatusIndicator } from "@/components/services/ServiceStatusBadge"; import { useI18n, interpolate } from "@/components/i18n-provider"; import { timeAgo } from "@/lib/time"; +import { useImageFallback } from "@/hooks/useImageFallback"; import { getHostingLabel } from "./ProjectCard"; /** Compact project summary with direct links to its management screens. */ @@ -20,10 +22,12 @@ const ProjectGridCard: React.FC<{ * every row by the projects list and `/info`, but isn't declared on `Project` * (constants/mock) yet, so it's spelled out here rather than cast away. */ project: Project & { primaryDomain?: string | null }; + preferAppLogo?: boolean; updateAvailable?: boolean; -}> = ({ project, updateAvailable }) => { +}> = ({ project, preferAppLogo, updateAvailable }) => { const { t } = useI18n(); const router = useRouter(); + const favicon = useImageFallback(project.favicon); const domain = projectDisplayDomain(project); const hosting = getHostingLabel(project.deployTarget, project.serverName, t); @@ -61,7 +65,20 @@ const ProjectGridCard: React.FC<{
- + {preferAppLogo && project.isApp ? ( + + ) : favicon.showImage ? ( + // eslint-disable-next-line @next/next/no-img-element + + ) : ( + + )}
diff --git a/apps/dashboard/src/app/(dashboard)/projects/components/project-icon.test.tsx b/apps/dashboard/src/app/(dashboard)/projects/components/project-favicon.test.tsx similarity index 67% rename from apps/dashboard/src/app/(dashboard)/projects/components/project-icon.test.tsx rename to apps/dashboard/src/app/(dashboard)/projects/components/project-favicon.test.tsx index e2482db84..2165098d3 100644 --- a/apps/dashboard/src/app/(dashboard)/projects/components/project-icon.test.tsx +++ b/apps/dashboard/src/app/(dashboard)/projects/components/project-favicon.test.tsx @@ -39,35 +39,10 @@ afterEach(async () => { }); for (const [name, Card] of [["list", ProjectCard], ["grid", ProjectGridCard]] as const) { - const render = (iconUrl = "/icon-old.png") => ( - + const render = (favicon = "/favicon-old.ico") => ( + ); - describe(`${name} iconUrl`, () => { - it("uses a custom icon before the catalog logo on the Apps page", async () => { - complete = false; - root = createRoot(container); - await act(async () => root!.render( - , - )); - expect(container.querySelector('img[alt=""]')?.getAttribute("src")).toBe("https://cdn.example.test/custom.png"); - }); - - it("uses the same catalog fallback when a custom icon fails or is cleared", async () => { - complete = false; - root = createRoot(container); - const custom = "https://cdn.example.test/custom.png"; - const view = (iconUrl: string | null) => ( - - ); - await act(async () => root!.render(view(custom))); - await act(async () => container.querySelector('img[alt=""]')!.dispatchEvent(new Event("error"))); - const fallback = container.querySelector('img[alt=""]')?.getAttribute("src"); - expect(fallback).toBeTruthy(); - expect(fallback).not.toBe(custom); - await act(async () => root!.render(view(null))); - expect(container.querySelector('img[alt=""]')?.getAttribute("src")).toBe(fallback); - }); - + describe(`${name} favicon`, () => { it("falls back when the image failed before hydration attached its error listener", async () => { const view = render(); container.innerHTML = renderToString(view); @@ -84,16 +59,16 @@ for (const [name, Card] of [["list", ProjectCard], ["grid", ProjectGridCard]] as await act(async () => root!.render(render())); await act(async () => container.querySelector('img[alt=""]')!.dispatchEvent(new Event("error"))); expect(container.querySelector('img[alt=""]')).toBeNull(); - await act(async () => root!.render(render("/icon-new.png"))); - expect(container.querySelector('img[alt=""]')?.getAttribute("src")).toBe("/icon-new.png"); + await act(async () => root!.render(render("/favicon-new.ico"))); + expect(container.querySelector('img[alt=""]')?.getAttribute("src")).toBe("/favicon-new.ico"); }); - it("keeps an image that loaded before hydration", async () => { + it("keeps a successfully cached favicon", async () => { naturalWidth = 32; const view = render(); container.innerHTML = renderToString(view); await act(async () => { root = hydrateRoot(container, view); }); - expect(container.querySelector('img[alt=""]')?.getAttribute("src")).toBe("/icon-old.png"); + expect(container.querySelector('img[alt=""]')?.getAttribute("src")).toBe("/favicon-old.ico"); }); }); } diff --git a/apps/dashboard/src/app/(dashboard)/projects/page.tsx b/apps/dashboard/src/app/(dashboard)/projects/page.tsx index 46aab35f3..c692c689e 100644 --- a/apps/dashboard/src/app/(dashboard)/projects/page.tsx +++ b/apps/dashboard/src/app/(dashboard)/projects/page.tsx @@ -109,11 +109,11 @@ export default function ProjectsPage() { ) : filtered.length > 0 ? ( view === "grid" ? (
- {filtered.map(project => )} + {filtered.map(project => )}
) : (
- {filtered.map(project => removeProject(project.id)} />)} + {filtered.map(project => removeProject(project.id)} />)}
) ) : ( diff --git a/apps/dashboard/src/app/(dashboard)/providers.tsx b/apps/dashboard/src/app/(dashboard)/providers.tsx index c6c3d0e49..e1407a0f6 100644 --- a/apps/dashboard/src/app/(dashboard)/providers.tsx +++ b/apps/dashboard/src/app/(dashboard)/providers.tsx @@ -7,7 +7,6 @@ import { PlatformProvider } from "@/context/PlatformContext"; import { MailScopeProvider } from "@/context/MailScopeContext"; import { AuthProvider, type AuthUser } from "@/context/AuthContext"; import { ModalProvider } from "@/context/ModalContext"; -import { DashboardPaymentsProvider } from "@/components/billing/PendingCheckoutsContext"; import type { ProductView } from "@/lib/product-view"; interface DashboardProvidersProps { @@ -51,7 +50,7 @@ export function DashboardProviders({ // Modal content renders where its provider lives, even when opened by a // descendant. Keep dashboard dialogs inside their platform/auth/mail context; // the root layout's provider serves public screens outside this shell. - const content = {children}; + const content = {children}; return ( - { - const result = await authClient.updateUser({ image }); - if (result.error) throw new Error(result.error.message || t.settings.imageUrl.failed); - }} - /> - - ); -} diff --git a/apps/dashboard/src/app/(dashboard)/settings/page.tsx b/apps/dashboard/src/app/(dashboard)/settings/page.tsx index 6b63ae685..2e4e5cea0 100644 --- a/apps/dashboard/src/app/(dashboard)/settings/page.tsx +++ b/apps/dashboard/src/app/(dashboard)/settings/page.tsx @@ -32,7 +32,6 @@ import { useI18n } from "@/components/i18n-provider"; import { BuildPreferences } from "./_components/BuildPreferences"; import { AppearanceSetting } from "./_components/AppearanceSetting"; -import { ProfileSetting } from "./_components/ProfileSetting"; import { AppearanceEditor } from "@/components/appearance/AppearanceEditor"; import { RoutePreferences } from "./_components/RoutePreferences"; import { DeployDefaults } from "./_components/DeployDefaults"; @@ -145,7 +144,6 @@ function SettingsPageInner() {
{activeTab === "general" && !customizeAppearance && ( <> - {/* Deploy Defaults + Routing hidden for now — advanced/rarely-needed, reduces general-settings noise. The edge defaults to loopback-port diff --git a/apps/dashboard/src/app/api/proxy/[...path]/route.test.ts b/apps/dashboard/src/app/api/proxy/[...path]/route.test.ts index 1626849fa..7859cba96 100644 --- a/apps/dashboard/src/app/api/proxy/[...path]/route.test.ts +++ b/apps/dashboard/src/app/api/proxy/[...path]/route.test.ts @@ -1,5 +1,4 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; -import { createHash } from "node:crypto"; import { NextRequest } from "next/server"; import { errorReporter, consoleErrorSink, type ErrorEvent } from "@repo/core/diagnostics"; @@ -28,21 +27,6 @@ afterEach(async () => { upstreamFetch.mockReset(); }); -it("streams folder uploads larger than the middleware default without changing their bytes", async () => { - const bytes = new Uint8Array(12 * 1024 * 1024).fill(117); - upstreamFetch.mockImplementationOnce(async (_url, init) => { - const received = new Uint8Array(await new Response(init?.body).arrayBuffer()); - expect(createHash("sha256").update(received).digest("hex")).toBe(createHash("sha256").update(bytes).digest("hex")); - expect(new Headers(init?.headers).get("authorization")).toBe("Bearer upload-test"); - return Response.json({ received: received.length }); - }); - const response = await POST(new NextRequest("https://ops.example.com/api/proxy/api/projects/folder/upload/session", { - method: "POST", headers: { authorization: "Bearer upload-test", "Content-Type": "application/gzip" }, body: bytes, - }), { params: Promise.resolve({ path: ["api", "projects", "folder", "upload", "session"] }) }); - expect(response.status).toBe(200); - expect(await response.json()).toEqual({ received: bytes.length }); -}); - it("correlates proxy network failures without logging credentials or request contents", async () => { upstreamFetch.mockRejectedValueOnce(Object.assign(new Error("Connection refused"), { code: "ECONNREFUSED", headers: { authorization: "private-proxy-token-913" }, diff --git a/apps/dashboard/src/components/actions/ActionBudget.test.tsx b/apps/dashboard/src/components/actions/ActionBudget.test.tsx index 8b7819c01..15d557a6d 100644 --- a/apps/dashboard/src/components/actions/ActionBudget.test.tsx +++ b/apps/dashboard/src/components/actions/ActionBudget.test.tsx @@ -15,6 +15,8 @@ const h = vi.hoisted(() => ({ checkout: vi.fn(), resume: vi.fn(), navigate: vi.fn(), + begin: vi.fn(), + closeTab: vi.fn(), closeDialog: vi.fn(), })); vi.mock("@/lib/api/billing", () => ({ @@ -26,7 +28,10 @@ vi.mock("@/lib/api/billing", () => ({ }, })); vi.mock("@/lib/checkout-navigation", () => ({ - navigateToCheckout: (url: string, preserve: boolean) => h.navigate(url, preserve), + beginCheckoutNavigation: (preserve: boolean) => { + h.begin(preserve); + return { navigate: h.navigate, close: h.closeTab }; + }, })); vi.mock("next/navigation", () => ({ useSearchParams: () => new URLSearchParams(h.query) })); vi.mock("@/lib/auth-client", () => ({ @@ -100,24 +105,25 @@ describe("Actions funding UI", () => { h.navigate.mockImplementation((url: string) => url); await render(true); await act(async () => button("Add $5").click()); - expect(h.navigate).toHaveBeenCalledWith(expect.any(String), true); + expect(h.begin).toHaveBeenCalledWith(true); + expect(h.begin.mock.invocationCallOrder[0]).toBeLessThan(h.checkout.mock.invocationCallOrder[0]!); expect(document.querySelector('a[href="https://checkout.stripe.com/saved"]')?.getAttribute("target")).toBe("_blank"); expect(h.closeDialog).not.toHaveBeenCalled(); await act(async () => button("Back to workflow").click()); expect(h.closeDialog).toHaveBeenCalledOnce(); }); - it("does not navigate on failure or expose an invalid payment link", async () => { + it("closes an unused payment tab on failure and does not expose an invalid payment link", async () => { h.budget.mockResolvedValue({ ...initial(), purchasesAvailable: true }); h.checkout.mockRejectedValueOnce(new Error("Provider unavailable")); await render(true); await act(async () => button("Add $5").click()); - expect(h.navigate).not.toHaveBeenCalled(); + expect(h.closeTab).toHaveBeenCalledOnce(); h.checkout.mockResolvedValue({ checkoutUrl: "javascript:invalid" }); h.navigate.mockImplementationOnce(() => { throw new Error("Invalid checkout URL"); }); await act(async () => button("Add $5").click()); expect(document.querySelector('a[href="javascript:invalid"]')).toBeNull(); - expect(h.navigate).toHaveBeenCalledExactlyOnceWith("javascript:invalid", true); + expect(h.closeTab).toHaveBeenCalledTimes(2); }); it("shows live VM estimates and one usage balance without a separate transfer allowance", async () => { @@ -217,7 +223,7 @@ describe("Actions funding UI", () => { await act(async () => button("Add $5").click()); await act(async () => button("Add $5").click()); expect(h.checkout.mock.calls[0]).toEqual(h.checkout.mock.calls[1]); - expect(h.navigate).toHaveBeenCalledWith("https://checkout.stripe.com/saved", false); + expect(h.navigate).toHaveBeenCalledWith("https://checkout.stripe.com/saved"); }); it("distinguishes a funded but paused budget from a balance that needs topping up", async () => { diff --git a/apps/dashboard/src/components/actions/ActionBudget.tsx b/apps/dashboard/src/components/actions/ActionBudget.tsx index fb5659368..5fe5f8876 100644 --- a/apps/dashboard/src/components/actions/ActionBudget.tsx +++ b/apps/dashboard/src/components/actions/ActionBudget.tsx @@ -6,7 +6,7 @@ import { useSearchParams } from "next/navigation"; import { Icon } from "@repo/ui/icons"; import type { ActionBudget as BudgetData, ActionCreditPurchase } from "@repo/contracts"; import { billingApi } from "@/lib/api/billing"; -import { navigateToCheckout } from "@/lib/checkout-navigation"; +import { beginCheckoutNavigation } from "@/lib/checkout-navigation"; import { randomUUID } from "@/lib/random-uuid"; import { PageContainer } from "@/components/ui/PageContainer"; import { Button } from "@/components/ui/button"; @@ -72,6 +72,7 @@ function Budget({ onClose }: { onClose?: () => void }) { async function checkout(id?: string) { if (!data?.purchasesAvailable || mutation.busy) return; + const navigation = beginCheckoutNavigation(!!onClose); setCheckoutUrl(null); if (!attempts.current.has(deposit)) attempts.current.set(deposit, randomUUID()); const result = await mutation.execute(() => @@ -84,13 +85,15 @@ function Budget({ onClose }: { onClose?: () => void }) { ); if (result?.checkoutUrl) { const url = result.checkoutUrl; - const destination = await mutation.execute(async () => navigateToCheckout(url, !!onClose)); + const destination = await mutation.execute(async () => navigation.navigate(url)); if (destination) setCheckoutUrl(destination); + else navigation.close(); } else if (result && !id) { // A completed/expired intent is no longer a new deposit. A subsequent // explicit purchase gets its own key; uncertain responses keep this one. attempts.current.delete(deposit); } + if (!result?.checkoutUrl) navigation.close(); budget.refresh(); } diff --git a/apps/dashboard/src/components/billing/CheckoutRecovery.tsx b/apps/dashboard/src/components/billing/CheckoutRecovery.tsx index 30467cccc..5851f8c66 100644 --- a/apps/dashboard/src/components/billing/CheckoutRecovery.tsx +++ b/apps/dashboard/src/components/billing/CheckoutRecovery.tsx @@ -15,8 +15,7 @@ import { getApiErrorCode, getApiErrorMessage } from "@/lib/api/client"; import { useSession } from "@/lib/auth-client"; import { useCloudResourceKey } from "@/context/CloudResourceContext"; import { newServerBillingHref, scopedBillingHref } from "@/lib/billing-links"; -import { navigateToCheckout } from "@/lib/checkout-navigation"; -import { invalidatePayments } from "@/lib/billing-events"; +import { beginCheckoutNavigation } from "@/lib/checkout-navigation"; import { ManagedServerActionFeedback } from "@/components/servers/managed/ManagedServerActionFeedback"; import { useManagedServerActions } from "@/components/servers/managed/useManagedServerActions"; import { useBillingScope } from "./BillingWorkspaceContext"; @@ -245,27 +244,33 @@ function CheckoutRow({ setBusy(operation); setError(null); setConfirmCancel(false); + const navigation = operation === "resume" ? beginCheckoutNavigation(preserveProject) : null; if (operation === "cancel") setCancelAttempted(true); try { const response = await billingApi[ operation === "resume" ? "resumeCheckout" : "cancelCheckout" ]({ workspaceId: item.server.id, id: item.id }); - if (!mounted.current) return; + if (!mounted.current) { + navigation?.close(); + return; + } setResult(response); if (response.status === "ready") { - if (!response.checkoutUrl || operation !== "resume") throw new Error(copy.actionError); - const url = navigateToCheckout(response.checkoutUrl, preserveProject); + if (!response.checkoutUrl || !navigation) throw new Error(copy.actionError); + const url = navigation.navigate(response.checkoutUrl); if (preserveProject) { setCheckoutUrl(url); onCheckoutStarted?.(url); } void onRefresh(); } else { + navigation?.close(); setCheckoutUrl(null); if (response.status === "expired") onCleared?.(); router.refresh(); } } catch (err) { + navigation?.close(); if (!mounted.current) return; setError(getApiErrorMessage(err, copy.actionError)); if (getApiErrorCode(err) === "BILLING_CHECKOUT_CANCEL_UNAVAILABLE") setCancelAttempted(false); @@ -273,7 +278,6 @@ function CheckoutRow({ // Refresh reads persisted recovery state; it never starts another checkout. void onRefresh(); } finally { - if (mounted.current) invalidatePayments(); busyRef.current = false; if (mounted.current) setBusy(null); } diff --git a/apps/dashboard/src/components/billing/CloudPlanPicker.tsx b/apps/dashboard/src/components/billing/CloudPlanPicker.tsx index d2f236ad1..e7f552876 100644 --- a/apps/dashboard/src/components/billing/CloudPlanPicker.tsx +++ b/apps/dashboard/src/components/billing/CloudPlanPicker.tsx @@ -13,7 +13,7 @@ import { useI18n } from "@/components/i18n-provider"; import type { BillingSubscription } from "@repo/contracts"; import type { BillingState } from "@/lib/api/billing"; import { needsCloudPlan } from "@/lib/billing-presentation"; -import { useCloudCheckout, useCloudPlans, type PreparedCheckoutWorkspace } from "./useCloudBilling"; +import { useCloudCheckout, useCloudPlans } from "./useCloudBilling"; import { useBillingWorkspace } from "./BillingWorkspaceContext"; import { CustomPlanConfigurator } from "./CustomPlanConfigurator"; import type { ApiPlan } from "./PricingCards"; @@ -86,7 +86,7 @@ function PlanPicker({ preserveProject?: boolean; onCheckoutStarted?: (checkoutUrl?: string) => void; /** New server acquisition resolves its identity only after choosing a plan. */ - prepareWorkspace?: () => Promise; + prepareWorkspace?: () => Promise; onWorkspaceRemoved?: (workspaceId: string) => void; purchaseDetails?: ReactNode; purchaseDisabled?: boolean; @@ -101,9 +101,8 @@ function PlanPicker({ Boolean(workspaceId ?? billingWorkspaceId) || (currentPlan === "free" && !subscription && !complimentary); const { payload, loading, error, retry } = useCloudPlans(); - // Preserve an explicit website choice; new purchases start with monthly billing. - const [purchaseInterval, setInterval] = useState<"monthly" | "annual">(requestedInterval ?? "monthly"); - const annualSavings = payload && payload.annual.monthsFree > 0 ? payload.ui.monthsFree : undefined; + // Preserve the website choice. Older links without an interval advertised monthly billing. + const [purchaseInterval, setInterval] = useState<"monthly" | "annual">(requestedInterval ?? (autoCheckout ? "monthly" : "annual")); const interval = subscription && subscription.status !== "canceled" ? subscription.interval : !complimentary && payload?.annual.enabled ? purchaseInterval : "monthly"; const hasPlan = !needsCloudPlan({ tier: currentPlan, subscription, complimentary }); @@ -428,14 +427,13 @@ function PlanPicker({ ) : ( @@ -488,13 +485,16 @@ function PlanPicker({ export function CloudCheckoutNotice({ checkoutUrl }: { checkoutUrl: string }) { const { t } = useI18n(); return ( -
-

{t.billing.deployGate.checkoutOpened}

- +
+

{t.billing.deployGate.checkoutOpened}

+ + {t.billing.deployGate.continueCheckout} +
); } diff --git a/apps/dashboard/src/components/billing/CustomPlanConfigurator.tsx b/apps/dashboard/src/components/billing/CustomPlanConfigurator.tsx index 5d4ad750d..63794a6a5 100644 --- a/apps/dashboard/src/components/billing/CustomPlanConfigurator.tsx +++ b/apps/dashboard/src/components/billing/CustomPlanConfigurator.tsx @@ -24,7 +24,6 @@ export function CustomPlanConfigurator({ allocatedDiskGb, actionLabel, interval = "monthly", - annualSavings, }: { catalog: NonNullable; plans: ApiPlan[]; @@ -37,7 +36,6 @@ export function CustomPlanConfigurator({ allocatedDiskGb?: number | null; actionLabel?: string; interval?: "monthly" | "annual"; - annualSavings?: string; onSelect: (quote: BillingCustomQuote) => void; }) { const { t } = useI18n(); @@ -70,7 +68,9 @@ export function CustomPlanConfigurator({ currentOffer?.price[interval] === quote.priceCents && currentOffer.monthlyCredits === quote.monthlyCredits)), ); - const rates = interval === "annual" ? catalog.extraAnnualCents : catalog.extraMonthlyCents; + const annualRates = interval === "annual" ? catalog.extraAnnualCents : undefined; + const rates = annualRates ?? catalog.extraMonthlyCents; + const rateMonths = annualRates ? 12 : 1; const bundle = plans.find((plan) => plan.id === quote?.basePlanTierId); const money = (cents: number) => `$${(cents / 100).toFixed(cents % 100 === 0 ? 0 : 2)}`; @@ -102,9 +102,7 @@ export function CustomPlanConfigurator({
)} - {rates && ( -

- {interpolate(interval === "annual" ? copy.yearlyRates : copy.rates, { - cpu: money(rates.cpuCore), - memory: money(rates.memoryGb), - disk: money(rates.diskGb), - })} -

- )} +

+ {interpolate(copy.rates, { + cpu: money(rates.cpuCore / rateMonths), + memory: money(rates.memoryGb / rateMonths), + disk: money(rates.diskGb / rateMonths), + })} +

{subscription &&

{copy.applyNotice}

} diff --git a/apps/dashboard/src/components/billing/PendingCheckoutsContext.tsx b/apps/dashboard/src/components/billing/PendingCheckoutsContext.tsx index d0fbed04f..25446098e 100644 --- a/apps/dashboard/src/components/billing/PendingCheckoutsContext.tsx +++ b/apps/dashboard/src/components/billing/PendingCheckoutsContext.tsx @@ -1,6 +1,5 @@ "use client"; -import { reportCaughtError } from "@repo/core/diagnostics"; import { createContext, useCallback, @@ -15,19 +14,13 @@ import { useResourceScope } from "@/hooks/use-scoped-resource"; import { useSession } from "@/lib/auth-client"; import { billingApi } from "@/lib/api/billing"; import { getApiErrorMessage } from "@/lib/api/client"; -import { managementApi } from "@/lib/api/management"; -import { subscriptionNeedsPayment } from "@/lib/billing-presentation"; -import { usePlatform } from "@/context/PlatformContext"; -import { useCloud } from "@/context/CloudContext"; import { useI18n } from "@/components/i18n-provider"; import { useBillingScope } from "./BillingWorkspaceContext"; -import { PAYMENTS_CHANGED } from "@/lib/billing-events"; type PendingCheckouts = { workspaceId?: string; items: BillingPendingCheckout[]; count: number; - attentionCount: number; loading: boolean; error: string | null; refresh: () => Promise; @@ -37,43 +30,29 @@ type PendingCheckouts = { const PendingCheckoutsContext = createContext(null); export const usePendingCheckouts = () => useContext(PendingCheckoutsContext); -/** One organization-wide payment read supplies the rail and billing hub. */ -export function DashboardPaymentsProvider({ children }: { children: ReactNode }) { - const { selfHosted, deployMode } = usePlatform(); - const { connected } = useCloud(); - return - {children} - ; -} - /** Share one read between billing navigation and recovery; never share customer data across scopes. */ export function PendingCheckoutsProvider({ children, workspaceId, enabled = true, - includeManagement = false, }: { children: ReactNode; workspaceId?: string; enabled?: boolean; - includeManagement?: boolean; }) { const scope = useResourceScope(); const { data: session, isPending } = useSession(); const { organizationId } = useBillingScope(); - const parent = usePendingCheckouts(); const allowed = enabled && !isPending && (!organizationId || organizationId === session?.session.activeOrganizationId); - if (parent && parent.workspaceId === workspaceId && allowed && !includeManagement) return children; return ( {children} @@ -85,13 +64,11 @@ function PendingCheckoutsState({ workspaceId, enabled, waiting, - includeManagement, }: { children: ReactNode; workspaceId?: string; enabled: boolean; waiting?: boolean; - includeManagement: boolean; }) { const { t } = useI18n(); const parent = usePendingCheckouts(); @@ -100,7 +77,6 @@ function PendingCheckoutsState({ const [closed, setClosed] = useState>(() => new Set()); const [loading, setLoading] = useState(enabled); const [error, setError] = useState(null); - const [managementPending, setManagementPending] = useState(false); const mounted = useRef(false); const revision = useRef(0); const refreshing = useRef(false); @@ -110,16 +86,6 @@ function PendingCheckoutsState({ refreshing.current = true; setLoading(true); setError(null); - if (includeManagement) { - // Keep compute recovery usable if this account cannot read Manage billing. - void managementApi.get().then(state => { - if (mounted.current && revision.current === request) setManagementPending(Boolean( - state.pendingCheckout || state.change?.paymentUrl || subscriptionNeedsPayment(state.subscription?.status), - )); - }).catch(error => { - reportCaughtError(error, "dashboard/components/billing/PendingCheckoutsContext"); - }); - } try { const result = await billingApi.listCheckouts(workspaceId); if (!mounted.current || revision.current !== request) return; @@ -136,7 +102,7 @@ function PendingCheckoutsState({ setLoading(false); } } - }, [enabled, workspaceId, includeManagement, t.billing.pendingPayments.loadError]); + }, [enabled, workspaceId, t.billing.pendingPayments.loadError]); useEffect(() => { mounted.current = true; void refresh(); @@ -145,13 +111,10 @@ function PendingCheckoutsState({ if (document.visibilityState === "visible" && !refreshing.current) void refresh(); }; window.addEventListener("focus", onFocus); - const onChanged = () => { void refresh(); }; - window.addEventListener(PAYMENTS_CHANGED, onChanged); return () => { mounted.current = false; revision.current++; window.removeEventListener("focus", onFocus); - window.removeEventListener(PAYMENTS_CHANGED, onChanged); }; }, [refresh]); const markCleared = useCallback( @@ -172,7 +135,6 @@ function PendingCheckoutsState({ refresh, markCleared, count: enabled ? items.filter((item) => !closed.has(item.id)).length : 0, - attentionCount: enabled ? new Set(items.filter(item => !closed.has(item.id)).map(item => item.server.id)).size + Number(managementPending) : 0, }} > {children} diff --git a/apps/dashboard/src/components/billing/PricingCards.tsx b/apps/dashboard/src/components/billing/PricingCards.tsx index 05dd4db3c..33b050e8b 100644 --- a/apps/dashboard/src/components/billing/PricingCards.tsx +++ b/apps/dashboard/src/components/billing/PricingCards.tsx @@ -115,7 +115,6 @@ interface PricingCardsProps { subscribingPlan?: string | null; purchasesDisabled?: boolean; interval?: "monthly" | "annual"; - annualSavings?: string; workspaceScoped?: boolean; selectionLabel?: string; referralOffer?: ReferralPublicOffer; @@ -132,10 +131,11 @@ function formatPrice( ): { label: string; suffix: string | null } { if (cents === null) return { label: ui.custom, suffix: null }; if (cents === 0) return { label: ui.free, suffix: null }; + const monthlyCents = interval === "annual" ? cents / 12 : cents; // Whole dollars stay whole ($39, not $39.00); a cents-precise price keeps them. return { - label: `$${(cents / 100).toFixed(cents % 100 === 0 ? 0 : 2)}`, - suffix: interval === "annual" ? ui.perYear : ui.perMonth, + label: `$${(monthlyCents / 100).toFixed(monthlyCents % 100 === 0 ? 0 : 2)}`, + suffix: ui.perMonth, }; } @@ -193,7 +193,6 @@ export const PricingCards: React.FC = ({ subscribingPlan, purchasesDisabled = false, interval = "monthly", - annualSavings, workspaceScoped = false, selectionLabel, referralOffer, @@ -219,6 +218,7 @@ export const PricingCards: React.FC = ({ const referral = referralOffer && referralPlans([plan], referralOffer, interval).length ? referralOffer : null; const { listCents, chargedCents, discounted } = resolveCardPrice(plan, interval, referral); + // Compare monthly equivalents; annual cards disclose the full charge below. const { label, suffix } = formatPrice( discounted ? chargedCents : listCents, ui, @@ -307,7 +307,7 @@ export const PricingCards: React.FC = ({

{isPaid ? interval === "annual" - ? annualSavings ?? t.billing.pricing.billedAnnually + ? interpolate(t.billing.pricing.annualTotal, { price: `$${(chargedCents! / 100).toFixed(chargedCents! % 100 === 0 ? 0 : 2)}` }) : ui.billedMonthly : ""}

diff --git a/apps/dashboard/src/components/billing/checkout-recovery.test.tsx b/apps/dashboard/src/components/billing/checkout-recovery.test.tsx index 19a048b40..0d2daa8fc 100644 --- a/apps/dashboard/src/components/billing/checkout-recovery.test.tsx +++ b/apps/dashboard/src/components/billing/checkout-recovery.test.tsx @@ -69,6 +69,12 @@ const ready = { const expired = { status: "expired", checkoutId: "cs_pending", checkoutUrl: null }; let root: Root; let host: HTMLDivElement; +let popup: { + opener: object | null; + closed: boolean; + location: { href: string }; + close: ReturnType; +}; const recovery = () => ( { h.get.mockImplementation(async () => ({ data: { items: [structuredClone(item)] } })); h.post.mockResolvedValue({ data: ready }); h.remove.mockResolvedValue({ ...server, state: "deleting" }); - vi.spyOn(window, "open").mockReturnValue(null); + popup = { opener: {}, closed: false, location: { href: "about:blank" }, close: vi.fn() }; + vi.spyOn(window, "open").mockReturnValue(popup as unknown as Window); host = document.createElement("div"); document.body.append(host); root = createRoot(host); @@ -150,7 +157,8 @@ describe("unfinished checkout recovery", () => { workspaceId: server.id, id: item.id, }); - expect(window.open).toHaveBeenCalledExactlyOnceWith(ready.checkoutUrl, "_blank", "noopener,noreferrer"); + expect(popup.location.href).toBe(ready.checkoutUrl); + expect(popup.opener).toBeNull(); expect(h.started).toHaveBeenCalledExactlyOnceWith(ready.checkoutUrl); expect(dialog()?.querySelector('a[target="_blank"]')?.getAttribute("href")).toBe( ready.checkoutUrl, @@ -366,7 +374,7 @@ describe("unfinished checkout recovery", () => { expect(h.get).toHaveBeenCalledTimes(2); }); - it.each(["local", "cloud"])("ignores earlier payment results after switching the %s account without opening checkout", async (account) => { + it.each(["local", "cloud"])("ignores earlier payment results after switching the %s account and closes its reserved tab", async (account) => { let finish!: (value: unknown) => void; h.post.mockReturnValueOnce( new Promise((resolve) => { @@ -384,7 +392,8 @@ describe("unfinished checkout recovery", () => { h.get.mockResolvedValueOnce({ data: { items: [] } }); await render(); await act(async () => finish({ data: ready })); - expect(window.open).not.toHaveBeenCalled(); + expect(popup.location.href).toBe("about:blank"); + expect(popup.close).toHaveBeenCalled(); expect(h.started).not.toHaveBeenCalled(); expect(dialog()?.textContent).not.toContain(item.name); }); @@ -412,15 +421,4 @@ describe("unfinished checkout recovery", () => { expect(host.querySelector("output")?.textContent).toBe("0"); expect(dialog()?.textContent).toContain(copy.canceled); }); - - it("does not reuse the organization's payment data in a foreign billing scope", async () => { - function Count({ id }: { id: string }) { return {usePendingCheckouts()?.count}; } - await render( - - - ); - expect(host.querySelector("#current")?.textContent).toBe("1"); - expect(host.querySelector("#foreign")?.textContent).toBe("0"); - expect(h.get).toHaveBeenCalledOnce(); - }); }); diff --git a/apps/dashboard/src/components/billing/cloud-deploy-pricing.test.tsx b/apps/dashboard/src/components/billing/cloud-deploy-pricing.test.tsx index aa1eb806d..0d6b443f0 100644 --- a/apps/dashboard/src/components/billing/cloud-deploy-pricing.test.tsx +++ b/apps/dashboard/src/components/billing/cloud-deploy-pricing.test.tsx @@ -65,6 +65,7 @@ function Harness() { let root: Root; let container: HTMLDivElement; +let checkoutTab: { opener: unknown; closed: boolean; location: { href: string }; close: ReturnType }; let open: ReturnType; const restriction = () => new ApiError(402, "Payment Required", { code: "CLOUD_BILLING_BLOCKED" }); function button(label: string) { @@ -88,7 +89,8 @@ beforeEach(() => { mocks.get.mockResolvedValue({ data: { locale: "en", annual: { enabled: true, monthsFree: 0 }, ui: pricingUi("en"), plans } }); mocks.deploy.mockRejectedValue(restriction()); mocks.post.mockResolvedValue({ data: { checkoutUrl: "https://checkout.example.test/session" } }); - open = vi.spyOn(window, "open").mockReturnValue(null); + checkoutTab = { opener: window, closed: false, location: { href: "about:blank" }, close: vi.fn() }; + open = vi.spyOn(window, "open").mockReturnValue(checkoutTab as unknown as Window); container = document.createElement("div"); document.body.append(container); root = createRoot(container); @@ -140,13 +142,13 @@ describe("deployment plan selection", () => { let resolveCheckout!: (value: unknown) => void; mocks.post.mockReturnValueOnce(new Promise((resolve) => { resolveCheckout = resolve; })); await act(async () => { button("Choose Hobby").click(); button("Choose Hobby").click(); }); - expect(open).not.toHaveBeenCalled(); + expect(open).toHaveBeenCalledOnce(); + expect(checkoutTab.opener).toBeNull(); + expect(checkoutTab.location.href).toBe("about:blank"); expect(mocks.post).toHaveBeenCalledTimes(1); - expect(mocks.post).toHaveBeenCalledWith("billing/subscription", expect.objectContaining({ planTierId: "starter", interval: "monthly", idempotencyKey: expect.any(String) })); + expect(mocks.post).toHaveBeenCalledWith("billing/subscription", expect.objectContaining({ planTierId: "starter", interval: "annual", idempotencyKey: expect.any(String) })); await act(async () => resolveCheckout({ data: { checkoutUrl: "https://checkout.example.test/session" } })); - expect(open).toHaveBeenCalledExactlyOnceWith("https://checkout.example.test/session", "_blank", "noopener,noreferrer"); - await click("Choose Hobby"); - expect(mocks.post).toHaveBeenCalledTimes(1); + expect(checkoutTab.location.href).toBe("https://checkout.example.test/session"); expect(container.querySelector("input")?.value).toBe("My configured project"); expect(mocks.deploy).toHaveBeenCalledTimes(1); await click(copy.deployGate.checkPlan); @@ -209,7 +211,7 @@ describe("deployment plan selection", () => { await click("Deploy"); await click("Choose Hobby"); expect(document.querySelector('[role="alert"]')?.textContent).toBe("Checkout temporarily unavailable"); - expect(open).not.toHaveBeenCalled(); + expect(checkoutTab.close).toHaveBeenCalledOnce(); await click("Choose Hobby"); expect(mocks.post.mock.calls[1]![1].idempotencyKey).toBe(mocks.post.mock.calls[0]![1].idempotencyKey); }); diff --git a/apps/dashboard/src/components/billing/server-plan-picker.test.tsx b/apps/dashboard/src/components/billing/server-plan-picker.test.tsx index 03937e70b..87dfc56d0 100644 --- a/apps/dashboard/src/components/billing/server-plan-picker.test.tsx +++ b/apps/dashboard/src/components/billing/server-plan-picker.test.tsx @@ -59,6 +59,7 @@ function customQuote(resources: CustomServerResources): BillingCustomQuote { let management: ManagementState; let root: Root; let host: HTMLDivElement; +let popup: { opener: object | null; closed: boolean; location: { href: string }; close: ReturnType }; function SidebarState() { const { autoCollapse } = useSidebarLayout(); const { collapsed } = useSidebarCollapse("plans", autoCollapse); @@ -100,16 +101,16 @@ beforeEach(() => { vi.resetAllMocks(); vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true); h.user = "user-a"; h.org = "org-a"; h.connected = true; h.sessionPending = false; window.location.href = "http://localhost:3000/"; - sessionStorage.clear(); management = { pricing: PRICING.management, purchasesAvailable: true, cloudIncluded: false, active: false, serverLimit: 0, connectedServers: 0, pendingCheckout: false, subscription: null, change: null }; - h.get.mockImplementation(async (path, options) => path === "billing/checkouts" ? { data: { items: [] } } : path === "/billing/manage" ? { data: management } : path.endsWith("/quote") + h.get.mockImplementation(async (path, options) => path === "/billing/manage" ? { data: management } : path.endsWith("/quote") ? { data: customQuote(options.params) } : catalog); h.create.mockResolvedValue(server); h.readServer.mockResolvedValue({ id: server.serverId, name: server.name, managed: server }); h.available.mockResolvedValue({ servers: [] }); h.post.mockResolvedValue({ data: { checkoutUrl: "https://checkout.example.test/new-server" } }); - vi.spyOn(window, "open").mockReturnValue(null); + popup = { opener: {}, closed: false, location: { href: "about:blank" }, close: vi.fn() }; + vi.spyOn(window, "open").mockReturnValue(popup as unknown as Window); host = document.createElement("div"); document.body.append(host); root = createRoot(host); }); afterEach(async () => { @@ -229,18 +230,16 @@ describe("referral checkout handoff", () => { : ordinary(path, options)); await render(); const card = (name: string) => host.querySelector(`article[aria-label="${name}"]`)!; - expect(card("Hobby").querySelector("s")).toBeNull(); - await click("Yearly"); - expect(card("Hobby").querySelector(".text-2xl")?.textContent).toBe("$108"); - expect(card("Hobby").querySelector("s")?.textContent).toBe("$120"); + expect(card("Hobby").textContent).toContain("$9"); + expect(card("Hobby").querySelector("s")?.textContent).toBe("$10"); expect(card("Starter").querySelector("s")).toBeNull(); await click("Monthly"); expect(card("Hobby").querySelector("s")).toBeNull(); await click("Yearly"); - expect(card("Hobby").querySelector("s")?.textContent).toBe("$120"); + expect(card("Hobby").querySelector("s")?.textContent).toBe("$10"); await click(baseDictionary.referrals.remove); expect(card("Hobby").querySelector("s")).toBeNull(); - expect(card("Hobby").querySelector(".text-2xl")?.textContent).toBe("$120"); + expect(card("Hobby").textContent).toContain("$10"); expect(h.post).not.toHaveBeenCalled(); }); @@ -258,7 +257,6 @@ describe("referral checkout handoff", () => { describe("annual Cloud purchases", () => { beforeEach(() => { h.get.mockImplementation(async (path, options) => { - if (path === "billing/checkouts") return { data: { items: [] } }; if (path.endsWith("/quote")) { const annual = options.params.interval === "annual"; return { data: { ...customQuote(options.params), reference: annual ? "quote-annual" : "quote-monthly", @@ -285,20 +283,15 @@ describe("annual Cloud purchases", () => { expect(h.post).not.toHaveBeenCalled(); }); - it("defaults to monthly, shows full yearly prices with savings, and submits the selected interval", async () => { + it("shows monthly equivalents with the upfront annual charge and submits yearly checkout", async () => { await render(purchase()); - expect(buttons(copy.pricing.monthly)[0]?.getAttribute("aria-pressed")).toBe("true"); - expect(host.querySelector("article .text-2xl")?.textContent).toBe("$12"); - await click(copy.pricing.annual); - expect(host.querySelector("article .text-2xl")?.textContent).toBe("$120"); - expect(host.querySelector("article")?.textContent).toContain(pricingUi("en").perYear); - expect(host.querySelector("article")?.textContent).toContain("2 months free"); - expect(host.querySelector("article")?.textContent).not.toContain(pricingUi("en").perMonth); - expect(host.querySelector("article")?.textContent).not.toContain("$120 billed yearly"); + expect(buttons(copy.pricing.annual)[0]?.getAttribute("aria-pressed")).toBe("true"); + expect(host.querySelector("article .text-2xl")?.textContent).toBe("$10"); await click(copy.pricing.monthly); expect(host.querySelector("article .text-2xl")?.textContent).toBe("$12"); - expect(host.querySelector("article")?.textContent).not.toContain("2 months free"); await click(copy.pricing.annual); + expect(host.querySelector("article")?.textContent).toContain("$10"); + expect(host.querySelector("article")?.textContent).toContain("$120 billed yearly"); await click("Choose Hobby"); expect(h.post).toHaveBeenCalledExactlyOnceWith("billing/subscription", expect.objectContaining({ planTierId: "hobby", interval: "annual", workspaceId: "cws-production", @@ -311,12 +304,7 @@ describe("annual Cloud purchases", () => { expect(host.querySelector('form button[type="submit"]')?.hasAttribute("disabled")).toBe(true); expect(h.post).not.toHaveBeenCalled(); await flushQuote(); - expect(host.querySelector("aside .text-3xl")?.textContent).toBe("$1188"); - expect(host.querySelector("aside")?.textContent).toContain(copy.custom.yearlyTotal); - expect(host.querySelector("aside")?.textContent).toContain(pricingUi("en").perYear); - expect(host.querySelector("aside")?.textContent).toContain("2 months free"); - expect(host.querySelector("aside")?.textContent).toContain("Yearly extras: $60/vCPU"); - expect(host.querySelector("aside")?.textContent).not.toContain("Monthly"); + expect(host.querySelector("aside")?.textContent).toContain("$1188 billed yearly"); await act(async () => host.querySelector("form")!.requestSubmit()); expect(h.post).toHaveBeenCalledExactlyOnceWith("billing/subscription", expect.objectContaining({ interval: "annual", custom: expect.objectContaining({ quoteReference: "quote-annual" }), @@ -546,83 +534,7 @@ describe("buying another managed server", () => { expect(h.create).not.toHaveBeenCalled(); expect(h.post).not.toHaveBeenCalled(); await click("Choose Starter"); - expect(h.create).toHaveBeenCalledExactlyOnceWith({ name: copy.workspaces.defaultName, idempotencyKey: expect.any(String) }); - }); - - it("reuses the manual server identity after a lost response and reopening the modal", async () => { - h.create.mockRejectedValueOnce(new Error("Creation response lost")); - await render(); - await click("Choose Hobby"); - expect(h.post).not.toHaveBeenCalled(); - const first = h.create.mock.calls[0]; - await act(async () => root.unmount()); root = createRoot(host); - await render(); - await click("Choose Hobby"); - expect(h.create.mock.calls[1]).toEqual(first); - expect(h.post).toHaveBeenCalledOnce(); - await click("Choose Hobby"); - expect(h.post).toHaveBeenCalledOnce(); - }); - - it("reopens an existing unpaid purchase without creating another Cloud space", async () => { - await render(); - await click("Add a destination"); await click("Choose Hobby"); - expect(h.create).toHaveBeenCalledOnce(); - await click(copy.workspaces.returnToSetup); - const ordinary = h.get.getMockImplementation()!; - h.get.mockImplementation((path, options) => path === "billing/checkouts" ? Promise.resolve({ data: { items: [{ - id: "a".repeat(64), checkoutId: "cs_pending", server, kind: "subscription", name: "Saved Hobby", - amountCents: 1200, currency: "usd", interval: "monthly", state: "open", canResume: true, canCancel: true, - }] } }) : ordinary(path, options)); - await click("Add a destination"); await click("Choose Hobby"); - expect(h.create).toHaveBeenCalledOnce(); - expect(document.body.textContent).toContain("Saved Hobby"); - expect(h.post).toHaveBeenCalledOnce(); - h.post.mockResolvedValueOnce({ data: { status: "ready", checkoutId: "cs_pending", checkoutUrl: "https://checkout.example.test/original" } }); - await click(copy.pendingPayments.resume); - expect(h.post).toHaveBeenLastCalledWith("billing/checkout/resume", { workspaceId: server.id, id: "a".repeat(64) }); - expect(window.open).toHaveBeenLastCalledWith("https://checkout.example.test/original", "_blank", "noopener,noreferrer"); - }); - - it("never creates resources when pending payments cannot be checked", async () => { - const ordinary = h.get.getMockImplementation()!; - h.get.mockImplementation((path, options) => path === "billing/checkouts" ? Promise.reject(new Error("Payment status unavailable")) : ordinary(path, options)); - await render(); await click("Choose Hobby"); - expect(h.create).not.toHaveBeenCalled(); expect(h.post).not.toHaveBeenCalled(); - expect(window.open).not.toHaveBeenCalled(); - expect(host.textContent).toContain("Payment status unavailable"); - }); - - it("opens recovery for a submitted payment without attempting another subscription", async () => { - const ordinary = h.get.getMockImplementation()!; - h.get.mockImplementation((path, options) => path === "billing/checkouts" ? Promise.resolve({ data: { items: [{ - id: "a".repeat(64), checkoutId: "cs_processing", server: { ...server, planTierId: "hobby" }, - kind: "subscription", name: "Submitted Hobby payment", amountCents: 1200, currency: "usd", - interval: "monthly", state: "processing", canResume: false, canCancel: false, - }] } }) : ordinary(path, options)); - await render(); await click("Choose Hobby"); - expect(h.create).not.toHaveBeenCalled(); expect(h.post).not.toHaveBeenCalled(); - expect(document.body.textContent).toContain("Submitted Hobby payment"); - expect(document.body.textContent).toContain(copy.pendingPayments.states.processing); - }); - - it("starts a new manual space after the previous purchase completed", async () => { - h.create.mockResolvedValueOnce({ ...server, planTierId: "hobby", state: "running" }); - await render(); await click("Choose Hobby"); - expect(h.create).toHaveBeenCalledTimes(2); - expect(h.create.mock.calls[1][0].idempotencyKey).not.toBe(h.create.mock.calls[0][0].idempotencyKey); - expect(h.post).toHaveBeenCalledOnce(); - }); - - it("does not create a space after the pending-payment read resolves for a different account", async () => { - let finish!: (value: unknown) => void; - const ordinary = h.get.getMockImplementation()!; - h.get.mockImplementation((path, options) => path === "billing/checkouts" ? new Promise(resolve => { finish = resolve; }) : ordinary(path, options)); - await render(); await click("Choose Hobby"); - h.org = "org-b"; await render(); - await act(async () => finish({ data: { items: [] } })); - expect(h.create).not.toHaveBeenCalled(); expect(h.post).not.toHaveBeenCalled(); - expect(window.open).not.toHaveBeenCalled(); + expect(h.create).toHaveBeenCalledExactlyOnceWith({ name: copy.workspaces.defaultName }); }); it("keeps the landing-page plan using the live offer without creating anything on arrival", async () => { @@ -721,8 +633,9 @@ describe("buying another managed server", () => { id: "a".repeat(64), checkoutId: "cs_pending", server, kind: "subscription", name: "Starter", amountCents: 2000, currency: "usd", interval: "monthly", state: "open", canResume: true, canCancel: true, }] } } : catalog); + h.post.mockRejectedValueOnce(new ApiError(409, "Already pending", { code: "CLOUD_WORKSPACE_CHECKOUT_PENDING" })); await render(); - expect(h.post).not.toHaveBeenCalled(); + const first = h.post.mock.calls[0][1].idempotencyKey; await click(copy.pendingPayments.cancel); h.post.mockResolvedValueOnce({ data: { status: "expired", checkoutId: "cs_pending", checkoutUrl: null } }); await click(copy.pendingPayments.confirmCancel); @@ -730,15 +643,14 @@ describe("buying another managed server", () => { expect(url.searchParams.has("startCheckout")).toBe(false); expect(url.searchParams.get("checkoutIntent")).toBe(key); expect(url.searchParams.get("checkoutAttempt")).not.toBe(key); - expect(h.post).toHaveBeenCalledOnce(); - h.get.mockImplementation(async path => path === "billing/checkouts" ? { data: { items: [] } } : catalog); + expect(h.post).toHaveBeenCalledTimes(2); await act(async () => root.unmount()); root = createRoot(host); await render(); - expect(h.post).toHaveBeenCalledOnce(); + expect(h.post).toHaveBeenCalledTimes(2); await click("Choose Starter"); - expect(h.create).toHaveBeenCalledExactlyOnceWith({ name: copy.workspaces.defaultName, idempotencyKey: key }); - expect(h.post.mock.calls[1][1].idempotencyKey).toBe(`${url.searchParams.get("checkoutAttempt")}-starter-monthly`); - expect(h.post.mock.calls[1][1].workspaceId).toBe(server.id); + expect(h.create.mock.calls[1]).toEqual(h.create.mock.calls[0]); + expect(h.post.mock.calls[2][1].idempotencyKey).not.toBe(first); + expect(h.post.mock.calls[2][1].workspaceId).toBe(server.id); }); it("starts a fresh explicit purchase after removing the cancelled draft", async () => { @@ -748,6 +660,7 @@ describe("buying another managed server", () => { id: "a".repeat(64), checkoutId: "cs_pending", server, kind: "subscription", name: "Starter", amountCents: 2000, currency: "usd", interval: "monthly", state: "open", canResume: true, canCancel: true, }] } } : catalog); + h.post.mockRejectedValueOnce(new ApiError(409, "Already pending", { code: "CLOUD_WORKSPACE_CHECKOUT_PENDING" })); await render(); await click(copy.pendingPayments.cancel); h.post.mockResolvedValueOnce({ data: { status: "expired", checkoutId: "cs_pending", checkoutUrl: null } }); @@ -755,12 +668,11 @@ describe("buying another managed server", () => { h.remove.mockResolvedValueOnce({ data: { accepted: true } }); await click(copy.pendingPayments.deleteServer); await click(copy.workspaces.confirmDelete); - expect(h.create).not.toHaveBeenCalled(); - h.get.mockImplementation(async path => path === "billing/checkouts" ? { data: { items: [] } } : catalog); + expect(h.create).toHaveBeenCalledOnce(); expect(new URL(window.location.href).searchParams.get("checkoutIntent")).not.toBe(key); expect(new URL(window.location.href).searchParams.has("startCheckout")).toBe(false); await click("Choose Starter"); - expect(h.create.mock.calls[0][0].idempotencyKey).not.toBe(key); + expect(h.create.mock.calls[1][0].idempotencyKey).not.toBe(key); }); it("does not continue a pending pricing purchase in another account or organization", async () => { @@ -782,7 +694,7 @@ describe("buying another managed server", () => { currentPeriod: { start: null, end: null }, monthlyCreditLimit: 0, buildTimeMinutes: 0, balance: { total: 0, quotaLimit: 0, quotaUsed: 0, quotaRemaining: 0 }, workspace: server, billing: { enabled: true } }; - h.get.mockImplementation(async path => path === "billing/checkouts" ? { data: { items: [] } } : path === "billing/state" ? { data: billing } : catalog); + h.get.mockImplementation(async path => path === "billing/state" ? { data: billing } : catalog); const location = window.location.href; await render(); await click("Add a destination"); @@ -817,7 +729,7 @@ describe("buying another managed server", () => { const started = vi.fn(); await render(); await act(async () => { buttons("Choose Starter")[0]!.click(); buttons("Choose Starter")[0]!.click(); }); - expect(h.create).toHaveBeenCalledExactlyOnceWith({ name: copy.workspaces.defaultName, idempotencyKey: expect.any(String) }); + expect(h.create).toHaveBeenCalledExactlyOnceWith({ name: copy.workspaces.defaultName }); expect(h.post).not.toHaveBeenCalled(); await act(async () => created(server)); expect(h.post).toHaveBeenCalledWith("billing/subscription", expect.objectContaining({ workspaceId: server.id, planTierId: "starter" })); @@ -826,7 +738,8 @@ describe("buying another managed server", () => { expect(h.create).toHaveBeenCalledOnce(); expect(h.post.mock.calls[1]).toEqual(h.post.mock.calls[0]); expect(started).toHaveBeenCalledWith(server, "https://checkout.example.test/new-server"); - expect(window.open).toHaveBeenCalledExactlyOnceWith("https://checkout.example.test/new-server", "_blank", "noopener,noreferrer"); + expect(popup.location.href).toBe("https://checkout.example.test/new-server"); + expect(popup.opener).toBeNull(); }); it("keeps the new server and exact purchase when retrying from unavailable-capacity feedback", async () => { @@ -837,7 +750,7 @@ describe("buying another managed server", () => { await click("Choose Pro"); expect(document.querySelector('[role="dialog"]')?.textContent).toContain(copy.checkoutUnavailable.capacityTitle); expect(document.body.textContent).not.toContain("Raw provider failure"); - expect(window.open).not.toHaveBeenCalled(); + expect(popup.close).toHaveBeenCalledOnce(); expect(h.post.mock.calls[0]![1]).toMatchObject({ workspaceId: server.id, planTierId: "pro" }); await click(copy.checkoutUnavailable.retry); expect(h.create).toHaveBeenCalledOnce(); @@ -850,6 +763,7 @@ describe("buying another managed server", () => { id: "a".repeat(64), checkoutId: "cs_pending", server, kind: "subscription", name: "Saved Starter", amountCents: 2000, currency: "usd", interval: "monthly", state: "open", canResume: true, canCancel: true, }] } } : catalog); + h.post.mockRejectedValueOnce(new ApiError(409, "Blocked", { code: "CLOUD_WORKSPACE_CHECKOUT_PENDING", error: "Raw pending error" })); h.post.mockImplementation(async path => path === "billing/checkout/cancel" ? { data: { status: "expired", checkoutId: "cs_pending", checkoutUrl: null } } : { data: { checkoutUrl: "https://checkout.example.test/new-server" } }); @@ -859,7 +773,6 @@ describe("buying another managed server", () => { expect(document.querySelector('[role="dialog"]')?.textContent).toContain(copy.pendingPayments.title); expect(document.body.textContent).not.toContain("Raw pending error"); await click(copy.pendingPayments.cancel); await click(copy.pendingPayments.confirmCancel); - h.get.mockImplementation(async path => path === "billing/checkouts" ? { data: { items: [] } } : catalog); if (remove) { await click(copy.pendingPayments.deleteServer); await click(copy.workspaces.confirmDelete); h.create.mockResolvedValueOnce({ ...server, id: "cws-replacement", serverId: "server-replacement" }); @@ -867,9 +780,10 @@ describe("buying another managed server", () => { await act(async () => document.querySelector(`button[aria-label="${copy.checkoutUnavailable.close}"]`)!.click()); await click("Choose Starter"); const attempts = h.post.mock.calls.filter(([path]) => path === "billing/subscription").map(([, input]) => input); - expect(attempts).toHaveLength(1); - expect(attempts[0].workspaceId).toBe(remove ? "cws-replacement" : server.id); - expect(h.create).toHaveBeenCalledTimes(remove ? 1 : 0); + expect(attempts).toHaveLength(2); + expect(attempts[1].idempotencyKey).not.toBe(attempts[0].idempotencyKey); + expect(attempts[1].workspaceId).toBe(remove ? "cws-replacement" : server.id); + expect(h.create).toHaveBeenCalledTimes(remove ? 2 : 1); }); it("discards an unavailable checkout when the customer changes organization", async () => { @@ -892,7 +806,7 @@ describe("buying another managed server", () => { await render(); await act(async () => created(server)); expect(h.post).not.toHaveBeenCalled(); - expect(window.open).not.toHaveBeenCalled(); + expect(popup.close).toHaveBeenCalled(); h.create.mockResolvedValueOnce({ ...server, id: "cws-org-b" }); await click("Choose Starter"); expect(h.post).toHaveBeenCalledWith("billing/subscription", expect.objectContaining({ workspaceId: "cws-org-b" })); diff --git a/apps/dashboard/src/components/billing/useCloudBilling.ts b/apps/dashboard/src/components/billing/useCloudBilling.ts index 8abbeea39..97fc55b83 100644 --- a/apps/dashboard/src/components/billing/useCloudBilling.ts +++ b/apps/dashboard/src/components/billing/useCloudBilling.ts @@ -7,12 +7,12 @@ import type { PlanTierId } from "@repo/core"; import type { BillingPlans, CustomSubscriptionSelection } from "@repo/contracts"; import { useI18n } from "@/components/i18n-provider"; import { api, ApiError, getApiErrorCode, getApiErrorMessage } from "@/lib/api/client"; -import { navigateToCheckout } from "@/lib/checkout-navigation"; -import { invalidatePayments } from "@/lib/billing-events"; +import { beginCheckoutNavigation } from "@/lib/checkout-navigation"; import { endpoints } from "@/lib/api/endpoints"; import { randomUUID } from "@/lib/random-uuid"; import { checkoutFailureKind, type CheckoutFailure } from "@/lib/checkout-failure"; -import { useResourceScope } from "@/hooks/use-scoped-resource"; +import { useSession } from "@/lib/auth-client"; +import { useCloudResourceKey } from "@/context/CloudResourceContext"; import type { ApiPlan, ApiPricingUi } from "./PricingCards"; interface PlansPayload extends Omit { @@ -20,8 +20,6 @@ interface PlansPayload extends Omit { plans: ApiPlan[]; } -export type PreparedCheckoutWorkspace = string | { workspaceId: string; checkoutPending: true }; - /** Both the recommendation and comparison use the same live checkout catalog. */ export function useCloudPlans() { const { t, locale } = useI18n(); @@ -49,7 +47,7 @@ export function useCloudCheckout({ enabled, preserveProject = false, onCheckoutS workspaceId?: string; preserveProject?: boolean; onCheckoutStarted?: (checkoutUrl: string) => void; - prepareWorkspace?: () => Promise; + prepareWorkspace?: () => Promise; onWorkspaceRemoved?: (workspaceId: string) => void; idempotencyKey?: string; referralCode?: string; @@ -57,8 +55,9 @@ export function useCloudCheckout({ enabled, preserveProject = false, onCheckoutS }) { const { t } = useI18n(); const { workspaceId: billingWorkspaceId, organizationId } = useBillingScope(); - const scope = useResourceScope(); - const ownerKey = `${scope}:${organizationId ?? ""}`; + const { data: session } = useSession(); + const cloudKey = useCloudResourceKey(); + const ownerKey = `${cloudKey}:${session?.user.id}:${organizationId ?? session?.session?.activeOrganizationId}`; const workspaceId = selectedWorkspaceId ?? billingWorkspaceId ?? undefined; const [subscribing, setSubscribing] = useState(null); const [error, setError] = useState(null); @@ -79,10 +78,11 @@ export function useCloudCheckout({ enabled, preserveProject = false, onCheckoutS useEffect(() => { attempts.current.clear(); }, [idempotencyKey]); async function startCheckout(planTierId: PlanTierId, interval: "monthly" | "annual", custom?: CustomSubscriptionSelection) { - if (!enabled || busy.current || checkoutUrl || planTierId === "free" || planTierId === "enterprise") return; + if (!enabled || busy.current || planTierId === "free" || planTierId === "enterprise") return; busy.current = true; const version = generation.current; - let checkoutStarted = false; + // Open within the user's click, preserving unfinished project configuration. + const navigation = beginCheckoutNavigation(preserveProject); setSubscribing(custom ? "custom" : planTierId); setError(null); setCheckoutUrl(null); @@ -91,13 +91,8 @@ export function useCloudCheckout({ enabled, preserveProject = false, onCheckoutS let targetWorkspaceId = workspaceId; let requestId: string | undefined; try { - const prepared = prepareWorkspace ? await prepareWorkspace() : workspaceId; - targetWorkspaceId = typeof prepared === "object" ? prepared.workspaceId : prepared; - if (version !== generation.current) return; - if (typeof prepared === "object" && prepared.checkoutPending) { - setPending({ workspaceId: prepared.workspaceId }); - return; - } + targetWorkspaceId = prepareWorkspace ? await prepareWorkspace() : workspaceId; + if (version !== generation.current) { navigation.close(); return; } if (prepareWorkspace && !targetWorkspaceId) throw new Error(t.billing.plansRoute.checkoutError); const attempt = `${targetWorkspaceId ?? "initial"}:${custom?.quoteReference ?? planTierId}:${interval}:${referralCode ?? ""}`; if (!attempts.current.has(attempt)) attempts.current.set(attempt, @@ -107,14 +102,14 @@ export function useCloudCheckout({ enabled, preserveProject = false, onCheckoutS planTierId, interval, workspaceId: targetWorkspaceId, custom, idempotencyKey: requestId, ...(referralCode ? { referralCode } : {}), }); - if (version !== generation.current) return; - const url = navigateToCheckout(res.data.checkoutUrl, preserveProject); + if (version !== generation.current) { navigation.close(); return; } + const url = navigation.navigate(res.data.checkoutUrl); if (preserveProject) { - checkoutStarted = true; setCheckoutUrl(url); onCheckoutStarted?.(url); } } catch (err) { + navigation.close(); if (version !== generation.current) return; const kind = checkoutFailureKind(err); if (getApiErrorCode(err) === "CLOUD_WORKSPACE_CHECKOUT_PENDING") setPending({ workspaceId: targetWorkspaceId }); @@ -125,9 +120,8 @@ export function useCloudCheckout({ enabled, preserveProject = false, onCheckoutS } } finally { if (version === generation.current) { - busy.current = checkoutStarted; + busy.current = false; setSubscribing(null); - invalidatePayments(); } } } @@ -135,7 +129,7 @@ export function useCloudCheckout({ enabled, preserveProject = false, onCheckoutS recovery: { isOpen: pending !== null, workspaceId: pending?.workspaceId, preserveProject, onClose: () => setPending(null), - onCleared: () => { busy.current = false; attempts.current.clear(); setCheckoutUrl(null); setError(null); onCheckoutSettled?.(); }, + onCleared: () => { attempts.current.clear(); setError(null); onCheckoutSettled?.(); }, onCheckoutStarted: (url: string) => { setCheckoutUrl(url); onCheckoutStarted?.(url); }, onServerRemoved: (id: string) => { attempts.current.clear(); setCheckoutUrl(null); onWorkspaceRemoved?.(id); diff --git a/apps/dashboard/src/components/import-project/DeploymentContainerConflictNotice.test.tsx b/apps/dashboard/src/components/import-project/DeploymentContainerConflictNotice.test.tsx deleted file mode 100644 index 838edb9f4..000000000 --- a/apps/dashboard/src/components/import-project/DeploymentContainerConflictNotice.test.tsx +++ /dev/null @@ -1,89 +0,0 @@ -// @vitest-environment happy-dom -import { act } from "react"; -import { createRoot, type Root } from "react-dom/client"; -import { afterEach, beforeEach, expect, it, vi } from "vitest"; -import { baseDictionary } from "@/i18n"; -import { - DEFAULT_CONFIG, - INITIAL_STATE, - type DeploymentContextType, -} from "@/context/deployment/types"; -import { DeploymentContainerConflictNotice } from "./DeploymentContainerConflictNotice"; - -let deployment: Pick; -vi.mock("@/context/DeploymentContext", () => ({ useDeployment: () => deployment })); -vi.mock("@/components/i18n-provider", () => ({ useI18n: () => ({ t: baseDictionary }) })); -let root: Root; -let host: HTMLDivElement; -const copy = baseDictionary.deployments.containerConflict; -beforeEach(() => { - vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true); - deployment = { - config: { - ...structuredClone(DEFAULT_CONFIG), - serverId: "server-current", - workspaceId: "space-current", - }, - state: { - ...structuredClone(INITIAL_STATE), - deploymentId: "attempt-original", - deploymentFailed: true, - errorCode: "SERVICE_CONTAINER_CONFLICT", - errorDetails: { - containerNames: ['', "app-duplicate"], - serverId: "server-original", - }, - }, - deploymentStatus: "failed", - }; - host = document.createElement("div"); - document.body.append(host); - root = createRoot(host); -}); -afterEach(async () => { - await act(async () => root.unmount()); - host.remove(); - vi.unstubAllGlobals(); -}); -async function render() { - await act(async () => root.render()); -} - -it("explains the conflict and links to the recorded server and support, without destructive actions", async () => { - await render(); - expect(host.textContent).toContain(copy.title); - expect(host.textContent).toContain("app-duplicate"); - expect(host.textContent).toContain("attempt-original"); - expect(host.querySelector('a[href="/servers/server-original"]')).not.toBeNull(); - expect(host.querySelector('a[href="/support"]')).not.toBeNull(); - expect(host.querySelectorAll("button")).toHaveLength(0); - expect(host.querySelector("img")).toBeNull(); -}); -it("opens the recorded managed space when no standalone server was recorded", async () => { - deployment.state.errorDetails = { containerNames: ["a", "b"], workspaceId: "space-original" }; - await render(); - expect(host.querySelector('a[href="/resources?pool=space-original"]')).not.toBeNull(); -}); -it("does not guess a missing historical target from current configuration", async () => { - deployment.state.errorDetails = null; - await render(); - expect(host.querySelectorAll("a")).toHaveLength(1); - expect(host.querySelector('a[href="/support"]')).not.toBeNull(); -}); -it.each(["building", "verifying", "ready", "cancelled"] as const)( - "clears the notice for %s", - async (status) => { - deployment.deploymentStatus = status; - await render(); - expect(host.textContent).toBe(""); - }, -); -it("does not reinterpret another error or a cancelled attempt as a container conflict", async () => { - deployment.state.errorCode = "HOST_UNREACHABLE"; - await render(); - expect(host.textContent).toBe(""); - deployment.state.errorCode = "SERVICE_CONTAINER_CONFLICT"; - deployment.state.deploymentCanceled = true; - await render(); - expect(host.textContent).toBe(""); -}); diff --git a/apps/dashboard/src/components/import-project/DeploymentContainerConflictNotice.tsx b/apps/dashboard/src/components/import-project/DeploymentContainerConflictNotice.tsx deleted file mode 100644 index 5c30828b0..000000000 --- a/apps/dashboard/src/components/import-project/DeploymentContainerConflictNotice.tsx +++ /dev/null @@ -1,61 +0,0 @@ -"use client"; - -import Link from "next/link"; -import { useDeployment } from "@/context/DeploymentContext"; -import { useI18n } from "@/components/i18n-provider"; -import { Button } from "@/components/ui/button"; - -/** Use this attempt's recorded target, even after the project has moved. */ -export function DeploymentContainerConflictNotice() { - const { state, deploymentStatus } = useDeployment(); - const { t } = useI18n(); - if ( - deploymentStatus !== "failed" || - state.deploymentCanceled || - state.errorCode !== "SERVICE_CONTAINER_CONFLICT" - ) - return null; - const copy = t.deployments.containerConflict; - const details = state.errorDetails; - const names = Array.isArray(details?.containerNames) - ? details.containerNames.filter((value): value is string => typeof value === "string") - : []; - const serverId = typeof details?.serverId === "string" && details.serverId; - const workspaceId = typeof details?.workspaceId === "string" && details.workspaceId; - const targetHref = serverId - ? `/servers/${encodeURIComponent(serverId)}` - : workspaceId - ? `/resources?pool=${encodeURIComponent(workspaceId)}` - : null; - - return ( -
-

{copy.title}

-

{copy.description}

- {names.length > 0 && ( -
    - {names.map((name, index) => ( -
  • - {name} -
  • - ))} -
- )} - {state.deploymentId && ( -

- {copy.reference}: {state.deploymentId} -

- )} -
- {targetHref && ( - - )} - -
-
- ); -} diff --git a/apps/dashboard/src/components/import-project/compose/ComposeDeploymentProcessing.tsx b/apps/dashboard/src/components/import-project/compose/ComposeDeploymentProcessing.tsx index ee5d48346..cf4cc6d1c 100644 --- a/apps/dashboard/src/components/import-project/compose/ComposeDeploymentProcessing.tsx +++ b/apps/dashboard/src/components/import-project/compose/ComposeDeploymentProcessing.tsx @@ -12,7 +12,6 @@ import { DeploymentHeader } from "../DeploymentHeader"; import { DeploymentHealthWarning } from "../DeploymentHealthWarning"; import { CloudBuildQueueNotice } from "../CloudBuildQueueNotice"; import { CloudDeploymentResourceNotice } from "../CloudDeploymentResourceNotice"; -import { DeploymentContainerConflictNotice } from "../DeploymentContainerConflictNotice"; import { DeploymentLayout } from "../DeploymentLayout"; import { DeploymentLogsPanel } from "../DeploymentLogsPanel"; import { PageContainer } from "@/components/ui/PageContainer"; @@ -577,7 +576,7 @@ function ComposeDeploymentBody({ return ( } + notice={} details={} navigation={
diff --git a/apps/dashboard/src/components/instance/InstanceLocation.tsx b/apps/dashboard/src/components/instance/InstanceLocation.tsx index 5b893c744..80efb4396 100644 --- a/apps/dashboard/src/components/instance/InstanceLocation.tsx +++ b/apps/dashboard/src/components/instance/InstanceLocation.tsx @@ -129,9 +129,9 @@ export function InstanceProgress({ Cancel move )} - {state.role === "active" && h?.provisioning?.deploymentId && ( + {h?.provisioning?.deploymentId && ( )}
diff --git a/apps/dashboard/src/components/instance/instance-location.test.tsx b/apps/dashboard/src/components/instance/instance-location.test.tsx index 37ab3fa0e..171377bd4 100644 --- a/apps/dashboard/src/components/instance/instance-location.test.tsx +++ b/apps/dashboard/src/components/instance/instance-location.test.tsx @@ -41,14 +41,4 @@ describe("instance handoff recovery UI", () => { expect(html).not.toContain("Cancel move"); expect(instanceProgress(retired)).toBe("Connecting to the new control plane"); }); - it("links server preparation to its build view while the source controller is active", () => { - const preparing: InstanceStatus = { ...state, role: "active", handoff: { - ...state.handoff!, provisioning: { projectId: "project", deploymentId: "deploy", access: "desktop" }, - } }; - const html = renderToStaticMarkup( {}} />); - expect(html).toContain('href="/build/deploy"'); - expect(html).not.toContain('href="/deployments/deploy"'); - const frozen = renderToStaticMarkup( {}} />); - expect(frozen).not.toContain("View deployment"); - }); }); diff --git a/apps/dashboard/src/components/migration/PlatformImportDomains.tsx b/apps/dashboard/src/components/migration/PlatformImportDomains.tsx deleted file mode 100644 index 63257c72b..000000000 --- a/apps/dashboard/src/components/migration/PlatformImportDomains.tsx +++ /dev/null @@ -1,69 +0,0 @@ -"use client"; - -import type { PlatformImportService } from "@repo/contracts"; -import { useI18n } from "@/components/i18n-provider"; - -export type ImportDomainService = Pick; - -/** Discovery and saved runs share the same public domain inventory. */ -export function PlatformImportDomains({ - services, - cutover = false, -}: { - services: ImportDomainService[]; - cutover?: boolean; -}) { - const { t } = useI18n(); - const copy = t.migration.platformDomains; - const domains = services.flatMap((service) => - (service.domains ?? []).map((domain) => ({ ...domain, service })), - ); - if (!cutover && !domains.length) return null; - - return ( -
-
-

{copy.title}

-

{copy.intro}

-
- {domains.length > 0 ? ( -
    - {domains.map(({ hostname, portable, service }) => ( -
  • -
    -

    - {hostname} -

    -

    {service.name}

    -
    - - {portable ? copy.customAction : copy.providerAction} - -
  • - ))} -
- ) : ( -

{copy.empty}

- )} - {!cutover && domains.some((domain) => domain.portable) && ( -

{copy.customHint}

- )} - {domains.some((domain) => !domain.portable) && ( -

{copy.providerHint}

- )} - {cutover && domains.length > 0 && ( -
-

{copy.next}

-
    -
  1. {copy.test}
  2. - {domains.some((domain) => domain.portable) &&
  3. {copy.dns}
  4. } -
  5. {copy.verify}
  6. -
-
- )} -
- ); -} diff --git a/apps/dashboard/src/components/migration/PlatformImportProgress.tsx b/apps/dashboard/src/components/migration/PlatformImportProgress.tsx index 6c7efe969..1f6361e11 100644 --- a/apps/dashboard/src/components/migration/PlatformImportProgress.tsx +++ b/apps/dashboard/src/components/migration/PlatformImportProgress.tsx @@ -9,7 +9,6 @@ import { InstallStepper, type StepStatus } from "@/components/deploy/InstallStep import { useI18n } from "@/components/i18n-provider"; import { formatBytes } from "@/lib/formatBytes"; import { statusTone } from "./MigrationRunList"; -import { PlatformImportDomains, type ImportDomainService } from "./PlatformImportDomains"; export const importFinished = (status: string) => ["failed", "rolled_back", "succeeded"].includes(status); @@ -49,10 +48,7 @@ export function PlatformImportProgress({ run.status, ); const stopped = run.status === "rolled_back" && run.cancelRequested === true; - const services = (run.inputSnapshot?.services ?? []) as ImportDomainService[]; - const projects = [ - ...new Map(Object.entries(run.importedProjects ?? {}).map(([source, id]) => [id, source])), - ].map(([id, source]) => ({ id, source })); + const projects = Object.entries(run.importedProjects ?? {}); const steps: Array<{ id: string; label: string; status: StepStatus }> = [ { id: "import", @@ -81,9 +77,7 @@ export function PlatformImportProgress({
-

- {projects.length > 1 ? "Imported projects" : "Imported project"} -

+

Imported projects

@@ -110,37 +104,47 @@ export function PlatformImportProgress({

)}
- {projects.map(({ source, id }, index) => ( -
- - - - {projects.length === 1 - ? run.projectName - : (services.find((s) => s.id === source)?.name ?? `Project ${index + 1}`)} - - Open project - - - {run.status === "awaiting_cutover" && ( - - )} -
+ {projects.map(([source, id], index) => ( + + + + {( + run.inputSnapshot?.services as Array<{ id: string; name: string }> | undefined + )?.find((s) => s.id === source)?.name ?? `Project ${index + 1}`} + + Open project + + ))} {!projects.length && (

- The imported project will appear here as the import progresses. + Created projects will appear here as the import progresses.

)}
+ {run.status === "awaiting_cutover" && ( +
+
+

Verify before moving traffic

+

+ Open each project, check its data, and add a test domain in Domains & Routes. + Then move your existing domains and confirm below. +

+
+

+ Keep source writers paused until cutover. Retire the old services at the provider + after verifying the destination. +

+ +
+ )} {run.status === "succeeded" && (

Migration complete. Your source resources remain at the provider until you retire @@ -159,24 +163,6 @@ export function PlatformImportProgress({

)}
- {run.status === "awaiting_cutover" && ( - <> - run.importedProjects?.[service.id])} - cutover - /> -
-

- Keep source writers paused until cutover. Retire the old services at the provider - after verifying the destination. -

- -
- - )} {run.deploymentId && ( void; }) { const imports = plan.services.filter((s) => choices[s.id]?.data !== "external"); - const projectCount = plan.projects?.length ?? 1; return (
@@ -87,15 +85,6 @@ export function PlatformImportReview({

{importDataLabel(service, choice)}

- {projectCount > 1 && ( -

- Project:{" "} - { - plan.projects?.find((project) => project.serviceIds.includes(service.id)) - ?.name - } -

- )}
{service.commit @@ -109,12 +98,6 @@ export function PlatformImportReview({ })}
- ({ - ...service, - name: choices[service.id].name, - }))} - /> {(plan.requiresWritePause || plan.requiresWorkerPause) && (
@@ -171,15 +154,8 @@ export function PlatformImportReview({

Review complete

- {projectCount} {projectCount === 1 ? "project" : "projects"} · {imports.length}{" "} - {imports.length === 1 ? "service" : "services"} + {imports.length} new {imports.length === 1 ? "project" : "projects"}

- {projectCount > 1 && ( -

- Separate projects keep each service’s repository and revision. Dependencies use - private connections on the destination server. -

- )}
- {busy ? "Starting import…" : "Import project"} + {busy + ? "Starting import…" + : `Import ${imports.length} ${imports.length === 1 ? "project" : "projects"}`}

- Services with different Git sources import into separate projects with private - connections. Review the destination projects before importing. Configure test domains - after import, then move production traffic. + Each selected service becomes a project. Configure test domains after import, then move + production traffic.

@@ -278,7 +252,7 @@ function ImportServiceCard({
- - {annual && } - {children} -
- + )} +
+ + {annual && } ); } diff --git a/apps/web/src/app/(site)/[locale]/(marketing)/pricing/_data.ts b/apps/web/src/app/(site)/[locale]/(marketing)/pricing/_data.ts index 96537396b..ef60ca052 100644 --- a/apps/web/src/app/(site)/[locale]/(marketing)/pricing/_data.ts +++ b/apps/web/src/app/(site)/[locale]/(marketing)/pricing/_data.ts @@ -22,7 +22,9 @@ export function faq(pricing: CloudPricing, copy: Copy): FaqItem[] { }) : copy("See your dashboard for current Cloud plans and availability."), pricing.annual.enabled - ? copy("Choose Yearly to see the full annual price, paid once a year.") + ? copy( + "Yearly billing is also available; the cards show the monthly equivalent and full yearly charge.", + ) : null, copy( "Each subscription includes one Cloud Space for your projects, with no per-seat fees. Share the included CPU, RAM and storage across your projects and builds.", diff --git a/apps/web/src/app/(site)/[locale]/(marketing)/pricing/page.tsx b/apps/web/src/app/(site)/[locale]/(marketing)/pricing/page.tsx index b792bca8c..b91eefcb9 100644 --- a/apps/web/src/app/(site)/[locale]/(marketing)/pricing/page.tsx +++ b/apps/web/src/app/(site)/[locale]/(marketing)/pricing/page.tsx @@ -11,7 +11,7 @@ import { IllustratedLink } from "@/components/marketing/illustrated-link"; import { CLOUD_SLA } from "@/lib/cloud-service"; import { UI, - startingCloudPlan, + cloudFrom, priceParts, getCloudPricing, cloudPlanSummary, @@ -61,7 +61,6 @@ function PlanCard({ cta, popular, support, - benefits = [], children, }: { name: string; @@ -73,7 +72,6 @@ function PlanCard({ cta: string; popular?: boolean; support: string; - benefits?: string[]; children: ReactNode; }) { const copy = useCopy(); @@ -99,14 +97,10 @@ function PlanCard({ {copy(cta)}