@wtfalch/foundry 0.34.0 → 0.35.1

package/dist/store/postgres.js

@@ -1,5 +1,5 @@
 import { and, asc, desc, eq, ne, sql } from 'drizzle-orm';
-import { APP_ENTRY_KEY, DEFAULT_MAIL_APPS, DEFAULT_NO_REPLY_LOCAL_PART, validateBuyerIdentity, validateCalls, validateDomain, validateHosting, validateMail, validateOwners, validateServices, validateSite, } from '../org.js';
+import { APP_ENTRY_KEY, DEFAULT_MAIL_APPS, DEFAULT_NO_REPLY_LOCAL_PART, validateBuyerIdentity, validateCalls, validateDomain, validateDomainClaim, validateHosting, validateMail, validateOwners, validateServices, validateSite, validateVersionPin, } from '../org.js';
 import { lockedHostnames } from '../plan/locked-hostnames.js';
 import { findNameClashes, nameClashMessage } from '../plan/org-names.js';
 import { validatePlatform } from '../platform.js';
@@ -146,6 +146,8 @@ function rowToOrg(row) {
                 },
             }
             : {}),
+        // Omitted while unset. Validated on read: a stored value is not trusted.
+        ...(row.versionPin ? { versionPin: readVersionPin(row) } : {}),
         site: { enabled: row.siteEnabled, usesDomain: row.siteUsesDomain },
         hosting: {
             enabled: row.hostingEnabled,
@@ -169,6 +171,14 @@ function rowToOrg(row) {
         test: row.isTest,
     };
 }
+function readVersionPin(row) {
+    const pin = row.versionPin;
+    const reason = validateVersionPin({ versionPin: pin });
+    if (reason) {
+        throw new DeclaredOrgError(`stored org ${row.slug} has an invalid versionPin: ${reason}`);
+    }
+    return pin;
+}
 function orgToRow(org) {
     return {
         id: org.id,
@@ -190,6 +200,7 @@ function orgToRow(org) {
         issuerUsesDomain: org.issuer.usesDomain,
         servicesOwn: org.services?.own ?? false,
         servicesSfuSlot: org.services?.sfuSlot ?? null,
+        versionPin: org.versionPin && Object.keys(org.versionPin).length > 0 ? org.versionPin : null,
         siteEnabled: org.site.enabled,
         siteUsesDomain: org.site.usesDomain,
         hostingEnabled: org.hosting.enabled,
@@ -288,6 +299,29 @@ export function createPostgresDeclaredOrgStore(db) {
         if (reason)
             throw new DeclaredOrgError(`domain invalid: ${reason} (#131)`);
     }
+    // The platform's apex and every other company's domain are read here, so a claim is checked against what is declared now.
+    async function requireDomainClaim(org) {
+        if (org.domain === null)
+            return;
+        const [platformRow] = await db
+            .select({
+            apex: foundryDeclaredPlatform.apex,
+            ownerOrgId: foundryDeclaredPlatform.ownerOrgId,
+        })
+            .from(foundryDeclaredPlatform)
+            .limit(1);
+        const others = await db
+            .select({ id: declaredOrgs.id, domain: declaredOrgs.domain })
+            .from(declaredOrgs)
+            .where(ne(declaredOrgs.id, org.id));
+        const reason = validateDomainClaim(org.domain, {
+            orgId: org.id,
+            platform: platformRow ?? null,
+            others,
+        });
+        if (reason)
+            throw new DeclaredOrgError(`domain invalid: ${reason}`);
+    }
     function requireValidLimit(fieldName, value) {
         if (value !== null && !NON_NEGATIVE_INTEGER.test(value)) {
             throw new DeclaredOrgError(`${fieldName} '${value}' must be a bigint-safe decimal string of a non-negative integer, or null for uncapped (#27)`);
@@ -357,6 +391,9 @@ export function createPostgresDeclaredOrgStore(db) {
         const reason = validateCalls(org);
         if (reason)
             throw new DeclaredOrgError(`calls invalid: ${reason} (#259)`);
+        const pinReason = validateVersionPin(org);
+        if (pinReason)
+            throw new DeclaredOrgError(`versionPin invalid: ${pinReason}`);
     }
     // Own-service rules, on `create` and on the merged result of `update`; no
     // two orgs share an `sfuSlot` (the unique index catches the race this misses).
@@ -396,6 +433,7 @@ export function createPostgresDeclaredOrgStore(db) {
             requireValidCalls(org);
             await requireValidServices(org);
             await requireNoNameClash(org);
+            await requireDomainClaim(org);
             try {
                 await db.insert(declaredOrgs).values(orgToRow(org));
             }
@@ -505,6 +543,8 @@ export function createPostgresDeclaredOrgStore(db) {
             requireValidCalls(next);
             await requireValidServices(next);
             await requireNoNameClash(next);
+            if (next.domain !== current.domain)
+                await requireDomainClaim(next);
             try {
                 // #351: with `expectedVersion` the version check is part of this one
                 // statement, so an edit that lands after the read above makes it match
@@ -689,6 +729,7 @@ function rowToPlatform(row) {
             gitRef: row.coolifyGitRef,
         },
         uptime: { enabled: row.uptimeEnabled, tag: row.uptimeTag, sha256: row.uptimeSha256 },
+        heartbeatsProvider: row.heartbeatsProvider,
     };
 }
 function platformToRow(platform) {
@@ -736,6 +777,7 @@ function platformToRow(platform) {
         uptimeEnabled: platform.uptime.enabled,
         uptimeTag: platform.uptime.tag,
         uptimeSha256: platform.uptime.sha256,
+        heartbeatsProvider: platform.heartbeatsProvider,
     };
 }
 /**

package/dist/store/schema.d.ts

@@ -355,6 +355,25 @@ export declare const declaredOrgs: import("drizzle-orm/pg-core").PgTableWithColu
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
+        versionPin: import("drizzle-orm/pg-core").PgColumn<{
+            name: "version_pin";
+            tableName: "foundry_declared_orgs";
+            dataType: "json";
+            columnType: "PgJsonb";
+            data: Record<string, string>;
+            driverParam: unknown;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            $type: Record<string, string>;
+        }>;
         siteEnabled: import("drizzle-orm/pg-core").PgColumn<{
             name: "site_enabled";
             tableName: "foundry_declared_orgs";
@@ -2170,6 +2189,23 @@ export declare const foundryDeclaredPlatform: import("drizzle-orm/pg-core").PgTa
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
+        heartbeatsProvider: import("drizzle-orm/pg-core").PgColumn<{
+            name: "heartbeats_provider";
+            tableName: "foundry_declared_platform";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
         serviceIds: import("drizzle-orm/pg-core").PgColumn<{
             name: "service_ids";
             tableName: "foundry_declared_platform";

package/dist/store/schema.js

@@ -38,6 +38,8 @@ export const declaredOrgs = pgTable('foundry_declared_orgs', {
     // ServicesConfig (org.ts): false and null are the platform's shared services.
     servicesOwn: boolean('services_own').notNull().default(false),
     servicesSfuSlot: integer('services_sfu_slot'),
+    // 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.
     siteEnabled: boolean('site_enabled').notNull().default(false),
     siteUsesDomain: boolean('site_uses_domain').notNull().default(false),
@@ -203,6 +205,8 @@ export const foundryDeclaredPlatform = pgTable('foundry_declared_platform', {
     uptimeEnabled: boolean('uptime_enabled').notNull().default(true),
     uptimeTag: text('uptime_tag').notNull().default(''),
     uptimeSha256: text('uptime_sha256').notNull().default(''),
+    /** foundry#544, `migrations/0053_heartbeats_provider.sql`: which Healthchecks instance manages the heartbeat checks, decoupled from `hcEnabled` above. */
+    heartbeatsProvider: text('heartbeats_provider').notNull().default('self-hosted'),
     /** `migrations/0018_platform_apply.sql`: the platform's applied state, `system:kind:key` to provider id. */
     serviceIds: jsonb('service_ids').$type().notNull().default({}),
     createdAt: timestamp('created_at', { withTimezone: true }).notNull().defaultNow(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wtfalch/foundry",
-  "version": "0.34.0",
+  "version": "0.35.1",
   "description": "Foundry's SDK: the declared org's types, the plan and apply contracts, and the state store's interface.",
   "repository": {
     "type": "git",
@@ -9,7 +9,7 @@
   },
   "license": "MIT",
   "type": "module",
-  "files": ["dist", "versions.json"],
+  "files": ["dist", "versions.json", "versions.digests.json"],
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -44,7 +44,7 @@
   "dependencies": {
     "@wtfalch/audit": "0.6.0",
     "@wtfalch/auth": "0.16.0",
-    "@wtfalch/edge": "0.12.0",
+    "@wtfalch/edge": "0.13.0",
     "@wtfalch/email": "^0.20.0",
     "@wtfalch/providers": "0.7.5",
     "ssh2": "1.17.0",

package/versions.digests.json

@@ -0,0 +1,11 @@
+{
+  "zitadel": "sha256:2ec2a42551862ca59dc752c321c7041358dea8b33b63ea5e021ec499ad5e2d9f",
+  "synapse": "sha256:6b95dd129e35e97e8032cb759e5db4a516a5f7ef6c98d34d716fea1ae239b62a",
+  "mas": "sha256:52c18ffcc940220a3b6aa5985b7e09d24ac27f5ed10a4d660c312e48f73ff105",
+  "livekit": "sha256:6fd3b7088874c4d119160dd688798dfec852bc014786d392caad15f6f63912a3",
+  "cloudflared": "sha256:072c067d25ccbe61d46e18f0d0723255f2bb5304f7317caa95b27031520ff92c",
+  "stalwart": "sha256:ec011be228596e37e65f41aab17deed573859614430472f7eeb42178c50d87b7",
+  "hc": "sha256:aa08a61b0dcfd83f1332eab195d5cec1b595ae076eb8388cadf8a3d597114f9b",
+  "alpine": "sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1",
+  "busybox": "sha256:5cec3fc171c87218698e85a52af7087de727372aae264a787b8112901a5b0092"
+}