@hogsend/engine 0.13.0 → 0.13.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hogsend/engine",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -40,14 +40,14 @@
     "svix": "^1.95.1",
     "winston": "^3.19.0",
     "zod": "^4.4.3",
-    "@hogsend/core": "^0.13.0",
-    "@hogsend/db": "^0.13.0",
-    "@hogsend/email": "^0.13.0",
-    "@hogsend/plugin-posthog": "^0.13.0",
-    "@hogsend/plugin-resend": "^0.13.0"
+    "@hogsend/core": "^0.13.1",
+    "@hogsend/db": "^0.13.1",
+    "@hogsend/email": "^0.13.1",
+    "@hogsend/plugin-posthog": "^0.13.1",
+    "@hogsend/plugin-resend": "^0.13.1"
   },
   "optionalDependencies": {
-    "@hogsend/plugin-postmark": "^0.13.0"
+    "@hogsend/plugin-postmark": "^0.13.1"
   },
   "devDependencies": {
     "@types/node": "^22.15.3",

package/src/env.ts

@@ -1,5 +1,13 @@
 import { createEnv } from "@t3-oss/env-core";
 import { z } from "zod";
+import { addrSpecOf } from "./lib/from-address.js";
+
+// A from address may be bare ("doug@hogsend.com") or carry a display name
+// ("Doug at Hogsend <doug@hogsend.com>") — both are valid provider wire
+// formats. Domain derivation (lib/from-address.ts) parses either form.
+const fromAddress = z.string().refine((value) => addrSpecOf(value) !== null, {
+  message: 'Must be an email address or "Display Name <email>"',
+});
 
 /**
  * The HTTP API contract version — surfaced in the OpenAPI document
@@ -52,7 +60,7 @@ export const env = createEnv({
     // (container.ts) and the future `emailProvidersFromEnv` preset. With this
     // optional, a Postmark-only deploy boots without a Resend key.
     RESEND_API_KEY: z.string().min(1).optional(),
-    RESEND_FROM_EMAIL: z.string().email().default("noreply@hogsend.com"),
+    RESEND_FROM_EMAIL: fromAddress.default("noreply@hogsend.com"),
     // --- Provider-neutral email config (BYO email provider) ---
     // The active email provider id the container resolves from the
     // EmailProviderRegistry. Absent → "resend" (today's byte-for-byte default).
@@ -60,7 +68,7 @@ export const env = createEnv({
     // Neutral default-from address. The mailer's `defaultFrom` is
     // `EMAIL_FROM ?? RESEND_FROM_EMAIL`, so an unset EMAIL_FROM keeps today's
     // Resend-named default.
-    EMAIL_FROM: z.string().email().optional(),
+    EMAIL_FROM: fromAddress.optional(),
     // The sending domain the domain-status service reports on. OVERRIDES the
     // default derivation (host part of EMAIL_FROM, falling back to the host of
     // RESEND_FROM_EMAIL) — set it when you send from a subaddress domain that

package/src/index.ts

@@ -203,6 +203,7 @@ export type {
 // --- Enrollment guards ---
 export { checkEmailPreferences } from "./lib/enrollment-guards.js";
 export { isFrequencyCapped } from "./lib/frequency-cap.js";
+export { addrSpecOf, hostOfFromAddress } from "./lib/from-address.js";
 export { hatchet } from "./lib/hatchet.js";
 // --- Ingestion pipeline ---
 export {

package/src/lib/domain-status.ts

@@ -1,5 +1,6 @@
 import type { DomainStatus, EmailProvider } from "@hogsend/core";
 import type { env as envSchema } from "../env.js";
+import { hostOfFromAddress } from "./from-address.js";
 import type { Logger } from "./logger.js";
 
 /**
@@ -91,13 +92,11 @@ function isPermissionDeniedMessage(message: string): boolean {
   return /\bdomains API (?:request failed with status )?40[13]\b/.test(message);
 }
 
-/** Extract the host part of an email address ("hello@x.com" → "x.com"). */
-function hostPartOf(email: string | undefined): string | null {
-  if (!email) return null;
-  const at = email.lastIndexOf("@");
-  if (at === -1 || at === email.length - 1) return null;
-  return email.slice(at + 1).toLowerCase();
-}
+/**
+ * Extract the host part of a configured from address ("hello@x.com" or
+ * "Name <hello@x.com>" → "x.com") — display-name aware via from-address.ts.
+ */
+const hostPartOf = hostOfFromAddress;
 
 /** The Resend unverified-domain from-address fallback (so a redirected mail
  * still delivers while the real sending domain isn't verified yet). */

package/src/lib/from-address.ts

@@ -0,0 +1,29 @@
+/**
+ * From-address helpers. A configured from address may be a bare addr-spec
+ * ("doug@hogsend.com") or carry a display name ("Doug at Hogsend
+ * <doug@hogsend.com>") — both are valid on the wire for every supported
+ * provider. These helpers parse either form so env validation and
+ * domain derivation agree on what the address part is.
+ */
+
+const ADDR_SPEC_RE = /^[^\s@<>]+@[^\s@<>]+\.[^\s@<>]+$/;
+
+/**
+ * Extract the addr-spec from a from address ("Doug <d@x.com>" → "d@x.com",
+ * "d@x.com" → "d@x.com"). Returns null when no valid address is present.
+ */
+export function addrSpecOf(value: string | undefined): string | null {
+  if (!value) return null;
+  const match = value.trim().match(/^[^<>]*<([^<>]+)>$/);
+  const addr = (match?.[1] ?? value).trim();
+  return ADDR_SPEC_RE.test(addr) ? addr.toLowerCase() : null;
+}
+
+/** Host part of a from address ("Doug <d@x.com>" → "x.com"). */
+export function hostOfFromAddress(value: string | undefined): string | null {
+  const addr = addrSpecOf(value);
+  if (!addr) return null;
+  const at = addr.lastIndexOf("@");
+  if (at === -1 || at === addr.length - 1) return null;
+  return addr.slice(at + 1);
+}