@wtfalch/foundry 0.47.0 → 0.48.0

package/dist/release/decide.js

@@ -150,7 +150,7 @@ export function decide(input) {
                 r = rollback(r, now, 'deploy timeout');
         }
         else {
-            const health = observation.health;
+            const health = input.hardOnly ? null : observation.health;
             const newC = health?.colors[rel.to] ?? { requests: 0, errors: 0 };
             const atWindow = r.window.kind === 'window' || r.window.kind === 'cap';
             let baseline = null;
@@ -162,6 +162,8 @@ export function decide(input) {
             let verdict;
             if (hard || hardRate)
                 verdict = 'hard_fail';
+            else if (input.hardOnly)
+                verdict = 'pass';
             else if (!health || baseline === null || newC.requests < RELATIVE_MIN_REQUESTS)
                 verdict = 'inconclusive';
             else
@@ -200,11 +202,13 @@ export function decide(input) {
                     }
                     else {
                         const required = Math.max(1, Math.ceil(health?.daily.requestsPerDay ?? 0));
-                        const closable = health !== null &&
-                            baseline !== null &&
-                            elapsed >= WINDOW_MIN_HOURS * HOUR &&
-                            newC.requests >= required &&
-                            rate(newC) <= baseline + ERROR_RATE_MARGIN;
+                        const closable = input.hardOnly
+                            ? elapsed >= WINDOW_MIN_HOURS * HOUR
+                            : health !== null &&
+                                baseline !== null &&
+                                elapsed >= WINDOW_MIN_HOURS * HOUR &&
+                                newC.requests >= required &&
+                                rate(newC) <= baseline + ERROR_RATE_MARGIN;
                         if (closable) {
                             out.effects.push({ kind: 'stop', color: rel.from });
                             r = { ...r, window: { kind: 'passed', at: now.toISOString() }, release: null };

package/dist/release/health.d.ts

@@ -39,10 +39,15 @@ export declare function readReleaseHealth(input: {
     headers?: Record<string, string>;
     fetchImpl?: typeof fetch;
 }): Promise<HealthRead | null>;
-/** An HTTP check of the color's health path on its own address. */
+/**
+ * An HTTP check of the color's health path on its own address. A redirect is a failure: it is how a login
+ * wall (Cloudflare Access) answers a machine. With `expectJson` the body must also parse as JSON, so a login page served with 200 is not read as a healthy color.
+ */
 export declare function checkColorAddress(input: {
     address: string;
     healthPath: string | null;
     headers?: Record<string, string>;
+    /** True for an app whose health path answers JSON; false for a static app's `/`. */
+    expectJson?: boolean;
     fetchImpl?: typeof fetch;
 }): Promise<'ok' | 'failed'>;

package/dist/release/health.js

@@ -45,14 +45,22 @@ export async function readReleaseHealth(input) {
         return null;
     }
 }
-/** An HTTP check of the color's health path on its own address. */
+/**
+ * An HTTP check of the color's health path on its own address. A redirect is a failure: it is how a login
+ * wall (Cloudflare Access) answers a machine. With `expectJson` the body must also parse as JSON, so a login page served with 200 is not read as a healthy color.
+ */
 export async function checkColorAddress(input) {
     try {
         const res = await (input.fetchImpl ?? fetch)(new URL(input.healthPath ?? '/', input.address), {
             ...(input.headers ? { headers: input.headers } : {}),
+            redirect: 'manual',
             signal: AbortSignal.timeout(ADDRESS_CHECK_TIMEOUT_MS),
         });
-        return res.ok ? 'ok' : 'failed';
+        if (!res.ok)
+            return 'failed';
+        if (input.expectJson)
+            await res.json();
+        return 'ok';
     }
     catch {
         // Unreachable counts as a failed check.

package/dist/release/run.d.ts

@@ -37,4 +37,6 @@ export declare function runRelease(input: {
     };
     now: Date;
     deps: ReleaseDeps;
+    /** No reporting health read: only hard fails count (see `decide`). */
+    hardOnly?: boolean;
 }): Promise<ReleaseRunResult>;

package/dist/release/run.js

@@ -16,7 +16,7 @@ export async function runRelease(input) {
     const actions = open.map((r) => r.action);
     const range = healthRange(recorded, now);
     const target = recorded.release?.to ?? null;
-    const health = range ? await deps.readHealth(range) : null;
+    const health = range && !input.hardOnly ? await deps.readHealth(range) : null;
     const seen = target
         ? await deps.observeColor(target)
         : { status: 'other', address: 'unchecked' };
@@ -27,6 +27,7 @@ export async function runRelease(input) {
         stepHoldMinutes: input.entry.stepHoldMinutes,
         now,
         observation: { health, ...seen },
+        ...(input.hardOnly ? { hardOnly: true } : {}),
     });
     for (const effect of decision.effects)
         await deps.effect(effect);

package/dist/store/postgres.js

@@ -1,5 +1,5 @@
 import { and, asc, desc, eq, inArray, isNull, ne, sql } from 'drizzle-orm';
-import { APP_ENTRY_KEY, DEFAULT_MAIL_APPS, DEFAULT_NO_REPLY_LOCAL_PART, refuseCustomers, refuseHosting, validateBlueGreen, validateBuyerIdentity, validateCalls, validateDomain, validateDomainClaim, validateMail, validateOwners, validateServices, validateSignIn, validateSite, validateVersionPin, } from '../org.js';
+import { APP_ENTRY_KEY, DEFAULT_MAIL_APPS, DEFAULT_NO_REPLY_LOCAL_PART, refuseBuiltinBlueGreen, refuseCustomers, refuseHosting, validateBlueGreen, validateBuyerIdentity, validateCalls, validateDomain, validateDomainClaim, validateMail, validateOwners, validateServices, validateSignIn, validateSite, validateVersionPin, } from '../org.js';
 import { hostingNames } from '../plan/locked-hostnames.js';
 import { findNameClashes, nameClashMessage } from '../plan/org-names.js';
 import { validatePlatform } from '../platform.js';
@@ -161,6 +161,12 @@ function rowToOrg(row) {
             ? { customers: { enabled: row.customersEnabled, signUp: row.customersSignUp } }
             : {}),
         // Omitted while unset. Validated on read: a stored value is not trusted.
+        ...(row.bouleBlueGreen
+            ? { boule: { blueGreen: readBlueGreen(row.bouleBlueGreen, 'boule') } }
+            : {}),
+        ...(row.agoraBlueGreen
+            ? { agora: { blueGreen: readBlueGreen(row.agoraBlueGreen, 'agora') } }
+            : {}),
         ...(row.versionPin ? { versionPin: readVersionPin(row) } : {}),
         site: { enabled: row.siteEnabled, usesDomain: row.siteUsesDomain },
         hosting: {
@@ -193,6 +199,13 @@ function readVersionPin(row) {
     }
     return pin;
 }
+function readBlueGreen(stored, app) {
+    const reason = validateBlueGreen(stored, app);
+    if (reason) {
+        throw new DeclaredOrgError(`a stored org has an invalid ${app}.blueGreen: ${reason}`);
+    }
+    return stored;
+}
 function orgToRow(org) {
     return {
         id: org.id,
@@ -215,6 +228,8 @@ function orgToRow(org) {
         signInInApp: org.signIn?.inApp ?? false,
         customersEnabled: org.customers?.enabled ?? false,
         customersSignUp: org.customers?.signUp ?? false,
+        bouleBlueGreen: org.boule?.blueGreen ?? null,
+        agoraBlueGreen: org.agora?.blueGreen ?? null,
         servicesOwn: org.services?.own ?? false,
         servicesSfuSlot: org.services?.sfuSlot ?? null,
         versionPin: org.versionPin && Object.keys(org.versionPin).length > 0 ? org.versionPin : null,
@@ -422,6 +437,10 @@ export function createPostgresDeclaredOrgStore(db) {
         if (customersRefusal) {
             throw new DeclaredOrgError(`customers invalid: ${customersRefusal.message}`, customersRefusal);
         }
+        const builtinRefusal = refuseBuiltinBlueGreen(org);
+        if (builtinRefusal) {
+            throw new DeclaredOrgError(`blue/green invalid: ${builtinRefusal.message}`, builtinRefusal);
+        }
         const slot = org.services?.sfuSlot ?? null;
         if (slot === null)
             return;

package/dist/store/schema.d.ts

@@ -1,4 +1,4 @@
-import type { AppEnvSource, HostingEntry, IssuerApp, OwnerIdentity } from '../org.js';
+import type { AppEnvSource, BlueGreenConfig, HostingEntry, IssuerApp, OwnerIdentity } from '../org.js';
 import type { Plan } from '../plan.js';
 import type { Checkpoint, DestroyRecord } from '../state.js';
 /**
@@ -406,6 +406,44 @@ export declare const declaredOrgs: import("drizzle-orm/pg-core").PgTableWithColu
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
+        bouleBlueGreen: import("drizzle-orm/pg-core").PgColumn<{
+            name: "boule_blue_green";
+            tableName: "foundry_declared_orgs";
+            dataType: "json";
+            columnType: "PgJsonb";
+            data: BlueGreenConfig | null;
+            driverParam: unknown;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            $type: BlueGreenConfig | null;
+        }>;
+        agoraBlueGreen: import("drizzle-orm/pg-core").PgColumn<{
+            name: "agora_blue_green";
+            tableName: "foundry_declared_orgs";
+            dataType: "json";
+            columnType: "PgJsonb";
+            data: BlueGreenConfig | null;
+            driverParam: unknown;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            $type: BlueGreenConfig | null;
+        }>;
         versionPin: import("drizzle-orm/pg-core").PgColumn<{
             name: "version_pin";
             tableName: "foundry_declared_orgs";

package/dist/store/schema.js

@@ -43,6 +43,9 @@ export const declaredOrgs = pgTable('foundry_declared_orgs', {
     // CustomersConfig (org.ts); migrations/0057.
     customersEnabled: boolean('customers_enabled').notNull().default(false),
     customersSignUp: boolean('customers_sign_up').notNull().default(false),
+    // OrgBuiltinApp.blueGreen (org.ts) of Boule and Agora; `migrations/0059_org_builtin_blue_green.sql`. Null is off.
+    bouleBlueGreen: jsonb('boule_blue_green').$type(),
+    agoraBlueGreen: jsonb('agora_blue_green').$type(),
     // VersionPin (org.ts): null follows the platform. `migrations/0053_org_version_pin.sql`.
     versionPin: jsonb('version_pin').$type(),
     // SiteConfig (org.ts, T10). A brand new org has no cms site.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wtfalch/foundry",
-  "version": "0.47.0",
+  "version": "0.48.0",
   "description": "Foundry's SDK: the declared org's types, the plan and apply contracts, and the state store's interface.",
   "repository": {
     "type": "git",