@wtfalch/foundry 0.11.0 → 0.12.0

package/dist/plan/executor.d.ts

@@ -604,6 +604,18 @@ export interface LettermintPort {
      */
     restrictDomainToProjects(domainId: string, projectIds: readonly string[]): Promise<void>;
 }
+/**
+ * `OrgMailOrg` with `domain` required (#345): a relay route is keyed to a
+ * domain, and `OrgMailOrg.domain` is absent for a level-1 org (its domain is
+ * `${slug}.${apex}`, resolved only once `applyOrgMail` returns
+ * `OrgMailResult.domain`) -- so a caller of `MailPort`'s three relay methods
+ * below must already hold that resolved domain and pass it explicitly,
+ * rather than the port guessing or refusing on a level-1 org's bare
+ * `mailOrgFor` result.
+ */
+export type OrgRelayMailOrg = OrgMailOrg & {
+    readonly domain: string;
+};
 /**
  * The Stalwart calls this executor makes for one org's mail, shaped to match
  * `@wtfalch/email/postmaster`'s `applyOrgMail`/`parkOrgMail` method-for-method
@@ -639,25 +651,29 @@ export interface MailPort {
      * minted (`ensureOrgLettermintRelay`'s own mint rule) -- it goes straight
      * here and nowhere else: never returned, never recorded, never logged, the
      * same discipline `ensureAppLettermintMail`'s own doc comment states for
-     * `LETTERMINT_API_TOKEN`.
+     * `LETTERMINT_API_TOKEN`. `org.domain` is required (#345): a level-1 org
+     * has none of its own on `OrgMailOrg`, so the caller passes the domain
+     * `applyOrgMail` already resolved for it.
      */
-    applyOrgRelay(org: OrgMailOrg, secret: string): Promise<void>;
+    applyOrgRelay(org: OrgRelayMailOrg, secret: string): Promise<void>;
     /**
      * Drops this org's relay route (#149), implemented with
      * `@wtfalch/email/postmaster`'s own `removeOrgRelay` -- a missing route is
      * a no-op, so `parkLettermintMail` can call this unconditionally before it
-     * deletes the Lettermint project the route pointed at.
+     * deletes the Lettermint project the route pointed at. `org.domain` is
+     * required (#345), the same reason {@link MailPort.applyOrgRelay} needs it.
      */
-    removeOrgRelay(org: OrgMailOrg): Promise<void>;
+    removeOrgRelay(org: OrgRelayMailOrg): Promise<void>;
     /**
      * True once this org's relay route exists on Stalwart with a secret set
      * (#149). `ensureOrgLettermintRelay`'s own mint rule reads this alongside
      * Lettermint's own project listing: a project without a live route (the
      * route recorded a token this executor never minted) is exactly as
      * unhealthy as a route with no project behind it, so a fresh mint fixes
-     * either.
+     * either. `org.domain` is required (#345), the same reason
+     * {@link MailPort.applyOrgRelay} needs it.
      */
-    hasOrgRelay(org: OrgMailOrg): Promise<boolean>;
+    hasOrgRelay(org: OrgRelayMailOrg): Promise<boolean>;
 }
 /**
  * The shared calls SFU's own per-org LiveKit API credentials (#122, #127,

package/dist/plan/executor.js

@@ -2343,9 +2343,13 @@ export class FoundryStepExecutor {
      */
     async ensureOrgLettermintRelay(org, mailOrg, mailDomain, context) {
         const relayName = `${org.slug}-relay`;
+        // #345: `mailOrg.domain` is absent for a level-1 org -- `mailDomain` is
+        // `applyOrgMail`'s own resolved result, the one domain `MailPort`'s
+        // relay methods ever need.
+        const relayOrg = { ...mailOrg, domain: mailDomain };
         const [projects, hasRelay] = await Promise.all([
             this.ports.lettermint.listProjects(),
-            this.ports.mail.hasOrgRelay(mailOrg),
+            this.ports.mail.hasOrgRelay(relayOrg),
         ]);
         // The recorded project, not "the only one": a leftover duplicate whose
         // delete keeps failing must not force a fresh mint on every apply.
@@ -2368,7 +2372,7 @@ export class FoundryStepExecutor {
                 // The restriction covers old and new projects, so the old one keeps
                 // sending until the route switches.
                 await this.ensureLettermintDomainRestriction(org, mailDomain, allProjects);
-                await this.ports.mail.applyOrgRelay(mailOrg, created.token);
+                await this.ports.mail.applyOrgRelay(relayOrg, created.token);
             }
             catch (err) {
                 await this.discardLettermintProject(created.project.id);
@@ -4061,7 +4065,9 @@ export class FoundryStepExecutor {
         const mailDomain = context.recordedIds()[MAIL_DOMAIN_SCOPE_KEY];
         if (!mailDomain)
             return;
-        await this.ports.mail.removeOrgRelay(mailOrg);
+        // #345: `mailOrg.domain` is absent for a level-1 org -- the previously
+        // recorded mail domain is the one `MailPort.removeOrgRelay` needs.
+        await this.ports.mail.removeOrgRelay({ ...mailOrg, domain: mailDomain });
         const names = new Set([`${org.slug}-app`, `${org.slug}-relay`]);
         const projects = await this.ports.lettermint.listProjects();
         for (const project of projects) {

package/package.json

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