mailery 0.10.1 → 0.11.0

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { R as RunnerContext, N as NormalizedEvent, C as ContactAdapter, a as Contact, A as AdapterFilter, M as MailProvider, S as SendArgs, b as SendResult, c as MailTesterFeedback, d as Mailer, T as TemplateDoc, e as SuppressionScope, D as DeliveryWindow, F as FlowStep, f as SegmentFilter, P as Predicate } from './null-CU_EApC6.cjs';
-export { g as AuditLogDoc, B as BroadcastDoc, h as BroadcastStatus, i as CircuitBreakerThresholds, j as Collections, k as ContactTagDoc, E as EventDoc, l as FlowDoc, m as FlowGoal, n as FlowRunDoc, o as FlowRunStatus, p as FlowVersionDoc, H as HealthDoc, q as HealthStatus, L as LeadDoc, r as MailerConfig, s as NullProvider, O as OutboxDoc, t as RESERVED_VAR_KEYS, u as RedisOptions, v as SegmentDefinition, w as SendDoc, x as SendStatus, y as SenderDomainConfig, z as SenderDomainRegistry, G as SenderDomainValidation, I as SubscriptionDoc, J as SubscriptionStatus, K as SuppressionDoc, Q as SuppressionReason, U as TemplateKind, V as TemplateVersionDoc, W as VarsAdapter, X as VarsResolveInfo, Y as WebhookEventDoc, Z as defineVars, _ as ensureIndexes, $ as getCollections, a0 as validateSenderDomain, a1 as varsJsonSchema } from './null-CU_EApC6.cjs';
+import { R as RunnerContext, N as NormalizedEvent, C as ContactAdapter, a as Contact, A as AdapterFilter, M as MailProvider, S as SendArgs, b as SendResult, c as MailTesterFeedback, d as Mailer, T as TemplateDoc, e as SuppressionScope, D as DeliveryWindow, F as FlowStep, f as SegmentFilter, P as Predicate } from './null-CfzvqNEp.cjs';
+export { g as AuditLogDoc, B as BroadcastDoc, h as BroadcastStatus, i as CircuitBreakerThresholds, j as Collections, k as ContactTagDoc, E as EventDoc, l as FlowDoc, m as FlowGoal, n as FlowRunDoc, o as FlowRunStatus, p as FlowVersionDoc, H as HealthDoc, q as HealthStatus, L as LeadDoc, r as MailerConfig, s as NullProvider, O as OutboxDoc, t as RESERVED_VAR_KEYS, u as RedisOptions, v as SegmentDefinition, w as SendDoc, x as SendStatus, y as SenderDomainConfig, z as SenderDomainRegistry, G as SenderDomainValidation, I as SubscriptionDoc, J as SubscriptionStatus, K as SuppressionDoc, Q as SuppressionReason, U as TemplateKind, V as TemplateVersionDoc, W as VarsAdapter, X as VarsResolveInfo, Y as WebhookEventDoc, Z as defineVars, _ as ensureIndexes, $ as getCollections, a0 as validateSenderDomain, a1 as varsJsonSchema } from './null-CfzvqNEp.cjs';
 import { ObjectId, Db, Filter } from 'mongodb';
 import { Request, Router } from 'express';
 import Handlebars from 'handlebars';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { R as RunnerContext, N as NormalizedEvent, C as ContactAdapter, a as Contact, A as AdapterFilter, M as MailProvider, S as SendArgs, b as SendResult, c as MailTesterFeedback, d as Mailer, T as TemplateDoc, e as SuppressionScope, D as DeliveryWindow, F as FlowStep, f as SegmentFilter, P as Predicate } from './null-CU_EApC6.js';
-export { g as AuditLogDoc, B as BroadcastDoc, h as BroadcastStatus, i as CircuitBreakerThresholds, j as Collections, k as ContactTagDoc, E as EventDoc, l as FlowDoc, m as FlowGoal, n as FlowRunDoc, o as FlowRunStatus, p as FlowVersionDoc, H as HealthDoc, q as HealthStatus, L as LeadDoc, r as MailerConfig, s as NullProvider, O as OutboxDoc, t as RESERVED_VAR_KEYS, u as RedisOptions, v as SegmentDefinition, w as SendDoc, x as SendStatus, y as SenderDomainConfig, z as SenderDomainRegistry, G as SenderDomainValidation, I as SubscriptionDoc, J as SubscriptionStatus, K as SuppressionDoc, Q as SuppressionReason, U as TemplateKind, V as TemplateVersionDoc, W as VarsAdapter, X as VarsResolveInfo, Y as WebhookEventDoc, Z as defineVars, _ as ensureIndexes, $ as getCollections, a0 as validateSenderDomain, a1 as varsJsonSchema } from './null-CU_EApC6.js';
+import { R as RunnerContext, N as NormalizedEvent, C as ContactAdapter, a as Contact, A as AdapterFilter, M as MailProvider, S as SendArgs, b as SendResult, c as MailTesterFeedback, d as Mailer, T as TemplateDoc, e as SuppressionScope, D as DeliveryWindow, F as FlowStep, f as SegmentFilter, P as Predicate } from './null-CfzvqNEp.js';
+export { g as AuditLogDoc, B as BroadcastDoc, h as BroadcastStatus, i as CircuitBreakerThresholds, j as Collections, k as ContactTagDoc, E as EventDoc, l as FlowDoc, m as FlowGoal, n as FlowRunDoc, o as FlowRunStatus, p as FlowVersionDoc, H as HealthDoc, q as HealthStatus, L as LeadDoc, r as MailerConfig, s as NullProvider, O as OutboxDoc, t as RESERVED_VAR_KEYS, u as RedisOptions, v as SegmentDefinition, w as SendDoc, x as SendStatus, y as SenderDomainConfig, z as SenderDomainRegistry, G as SenderDomainValidation, I as SubscriptionDoc, J as SubscriptionStatus, K as SuppressionDoc, Q as SuppressionReason, U as TemplateKind, V as TemplateVersionDoc, W as VarsAdapter, X as VarsResolveInfo, Y as WebhookEventDoc, Z as defineVars, _ as ensureIndexes, $ as getCollections, a0 as validateSenderDomain, a1 as varsJsonSchema } from './null-CfzvqNEp.js';
 import { ObjectId, Db, Filter } from 'mongodb';
 import { Request, Router } from 'express';
 import Handlebars from 'handlebars';

package/dist/index.js

@@ -304,7 +304,10 @@ var init_sendgrid = __esm({
           replyTo: args.replyTo,
           subject: args.subject,
           text: args.text,
-          html: args.html,
+          // Omit the key entirely rather than sending `html: undefined` — a
+          // text_only template must produce a single-part text/plain message, and
+          // an explicit undefined can still serialize into an empty HTML part.
+          ...args.html ? { html: args.html } : {},
           headers: args.headers,
           customArgs: args.messageMeta,
           trackingSettings: {
@@ -2143,7 +2146,8 @@ async function dispatchSend(sendId, ctx) {
     await markFailed(send._id, `render error: ${String(err?.message ?? err)}`, ctx);
     throw err;
   }
-  const tracking = applyTracking(rendered.html, {
+  const textOnly = template.bodyFormat === "text_only";
+  const tracking = textOnly ? { html: "", links: [] } : applyTracking(rendered.html, {
     sendId: String(send._id),
     publicUrl: ctx.config.publicUrl,
     trackOpens: template.trackOpens ?? ctx.config.trackOpens,
@@ -2155,7 +2159,9 @@ async function dispatchSend(sendId, ctx) {
     {
       $set: {
         links: tracking.links,
-        bodyHash: sha256(tracking.html),
+        // Hash what actually goes out, so a text_only send's fingerprint
+        // tracks the text body rather than an HTML part it never had.
+        bodyHash: sha256(textOnly ? rendered.plainText : tracking.html),
         status: "sending",
         fromName: rendered.fromName,
         fromEmail: rendered.fromEmail,
@@ -2180,7 +2186,7 @@ async function dispatchSend(sendId, ctx) {
       fromEmail: rendered.fromEmail,
       replyTo: rendered.replyTo ?? void 0,
       subject: rendered.subject,
-      html: tracking.html,
+      ...textOnly ? {} : { html: tracking.html },
       text: rendered.plainText,
       headers,
       messageMeta: { sendId: String(send._id) }
@@ -4811,12 +4817,15 @@ function isAllCaps(subject) {
 // src/server/api/admin.ts
 init_vars();
 
+// src/shared/enums.ts
+var TEMPLATE_BODY_FORMATS = ["multipart", "text_only"];
+
 // src/server/api/setup-status.ts
 async function runSetupChecks(mailer) {
   const checks = [];
   checks.push(await checkMongo(mailer));
   checks.push(await checkQueue(mailer));
-  if (mailer.config.queue.driver !== "noop" && !mailer.config.workerless) {
+  if (mailer.config.queue.driver !== "noop") {
     checks.push(await checkWorkersHeartbeat(mailer));
   }
   checks.push(await checkCircuitBreaker(mailer));
@@ -4881,13 +4890,14 @@ async function checkWorkersHeartbeat(mailer) {
   );
   const tickIntervalMs = mailer.config.tickIntervalSeconds * 1e3;
   const staleAfterMs = Math.max(tickIntervalMs * 3, 3e4);
+  const workerless = mailer.config.workerless;
   if (!h) {
     return {
       name: "workers_heartbeat",
       label: "Background workers",
       severity: "warn",
-      message: "no tick has run yet",
-      hint: "If your separate worker process is started, the heartbeat will appear within one tick interval. If you forgot to run `mailer.startWorkers()`, sends will sit queued indefinitely."
+      message: workerless ? "no tick has run yet (workers run in another process)" : "no tick has run yet",
+      hint: workerless ? "This process is workerless; the heartbeat comes from your separate worker process. If that process is started, the heartbeat will appear within one tick interval \u2014 a fresh install legitimately has none yet." : "If your separate worker process is started, the heartbeat will appear within one tick interval. If you forgot to run `mailer.startWorkers()`, sends will sit queued indefinitely."
     };
   }
   const ageMs = Date.now() - new Date(h.updatedAt).getTime();
@@ -4897,14 +4907,14 @@ async function checkWorkersHeartbeat(mailer) {
       label: "Background workers",
       severity: "error",
       message: `last tick ${humanDuration(ageMs)} ago (expected within ${humanDuration(tickIntervalMs)})`,
-      hint: "Workers appear to be down. Sends and flow advancement are halted. Restart your worker process (`mailer.startWorkers()`)."
+      hint: workerless ? "Workers run in another process, and that process appears to be down. Sends and flow advancement are halted. Restart the process that calls `mailer.startWorkers()`." : "Workers appear to be down. Sends and flow advancement are halted. Restart your worker process (`mailer.startWorkers()`)."
     };
   }
   return {
     name: "workers_heartbeat",
     label: "Background workers",
     severity: "ok",
-    message: `last tick ${humanDuration(ageMs)} ago`
+    message: `last tick ${humanDuration(ageMs)} ago${workerless ? " (worker process)" : ""}`
   };
 }
 async function checkCircuitBreaker(mailer) {
@@ -6469,6 +6479,7 @@ function apiRouter(mailer, opts = {}) {
             lastModifiedAt: now
           },
           tags: [],
+          bodyFormat: "multipart",
           trackOpens: kind === "marketing",
           trackClicks: kind === "marketing",
           stats: { sent: 0, delivered: 0, opened: 0, clicked: 0, bounced: 0, complained: 0, unsubscribed: 0, lastSentAt: null },
@@ -6494,7 +6505,7 @@ function apiRouter(mailer, opts = {}) {
     asyncHandler(async (req, res) => {
       const tpl = await c.templates.findOne({ slug: req.params.slug });
       if (!tpl) return res.status(404).json({ error: "not_found" });
-      const { subject, preheader, mjml, editorJson, notes, name, fromName, fromEmail, replyTo, kind, trackOpens, trackClicks } = req.body ?? {};
+      const { subject, preheader, mjml, editorJson, notes, name, fromName, fromEmail, replyTo, kind, bodyFormat, trackOpens, trackClicks } = req.body ?? {};
       const set = {
         "draft.lastModifiedBy": req.actor,
         "draft.lastModifiedAt": /* @__PURE__ */ new Date(),
@@ -6522,6 +6533,7 @@ function apiRouter(mailer, opts = {}) {
           });
         }
       }
+      if (TEMPLATE_BODY_FORMATS.includes(bodyFormat)) set.bodyFormat = bodyFormat;
       if (typeof trackOpens === "boolean") set.trackOpens = trackOpens;
       if (typeof trackClicks === "boolean") set.trackClicks = trackClicks;
       await c.templates.updateOne({ _id: tpl._id }, { $set: set });
@@ -6607,7 +6619,9 @@ function apiRouter(mailer, opts = {}) {
           fromEmail: tpl.fromEmail,
           replyTo: tpl.replyTo ?? void 0,
           subject: draft.subject,
-          html: compiled.html,
+          // Match the real send shape — a text_only template's deliverability
+          // should be scored on the single-part message it actually sends.
+          ...tpl.bodyFormat === "text_only" ? {} : { html: compiled.html },
           text: compiled.plainText,
           headers: {},
           messageMeta: { mailTesterCheckId: checkId }
@@ -6952,7 +6966,9 @@ function apiRouter(mailer, opts = {}) {
         fromName: rendered.fromName,
         fromEmail: rendered.fromEmail,
         subject: `[TEST] ${rendered.subject}`,
-        html: tracking.html,
+        // Match the real send shape, or a test of a text_only template would
+        // arrive as HTML and hide exactly what the author is checking.
+        ...tpl.bodyFormat === "text_only" ? {} : { html: tracking.html },
         text: rendered.plainText
       });
       await mailer.audit({
@@ -7592,7 +7608,7 @@ var DEDUPE_POLICIES = [
 ];
 
 // src/server/index.ts
-var VERSION = "0.10.1" ;
+var VERSION = "0.11.0" ;
 
 export { DEDUPE_POLICIES, FLOW_STEP_KINDS, Mailer, MongoContactAdapter, NullProvider, PREDICATE_KINDS, RESERVED_VAR_KEYS, SEGMENT_FILTER_KINDS, SendGridProvider, VERSION, applyTracking, applyWebhookEvent, compileMailyTemplate, compileTemplate, computeDeliveryTime, createAdminRouter, createPublicRouter, defaultFlowStep, defaultPredicate, defaultSegmentFilter, defineVars, derivePlaintext, dispatchSend, ensureIndexes, getCollections, predicateKind, processNewlyFiredEventTriggers, processOneRunStep, renderTemplate, runTick, sha256Hex, signUnsubscribeToken, sweepStrandedFlowRuns, validateSenderDomain, varsJsonSchema, verifyUnsubscribeToken };
 //# sourceMappingURL=index.js.map