@drawbridge/drawbridge-utils 0.0.166 → 0.0.168

package/dist/connections/index.cjs

@@ -1614,10 +1614,10 @@ var free = {
 };
 var plans = {
   DB00002: {
-    // A verified sending domain is a PAID capability: free plans cannot send
-    // lead-facing email at all (the send path gates on an active
-    // subscription), so granting it there would offer a domain that can
-    // never send from.
+    // A verified sending domain is a PAID capability. Every plan sends
+    // lead-facing email from the platform address — the send is billed as an
+    // action, so the allowance is the entitlement — and sending from your own
+    // domain is what the paid tiers add on top.
     features: all.features([organization.networking.key, organization.members.key]),
     limits: all.limits({ actions: 5e3, members: 3, storage: gigabyte * 10 }),
     marketing: {
@@ -2221,16 +2221,6 @@ var drawbridge_default2 = {
         const request2 = { to };
         const { ok: sendable } = await canSend({ channel: "email", to });
         if (!sendable) return { message: "Recipient has opted out \u2014 skipped.", request: request2, response: { skipped: true }, skipped: true };
-        const organization2 = await read.get({ collection: "organization", query: { id: workflow.organization } });
-        const subscription = (organization2 == null ? void 0 : organization2.subscription) ? await read.get({ collection: "subscription", query: { id: organization2.subscription } }) : null;
-        if ((subscription == null ? void 0 : subscription.status) !== "active") {
-          return {
-            message: "Organization has no active subscription \u2014 workflow-step email skipped.",
-            request: request2,
-            response: { skipped: true },
-            skipped: true
-          };
-        }
         return {
           message: "Email queued for delivery to " + to + ".",
           request: request2,

package/dist/connections/index.d.cts

@@ -2397,25 +2397,10 @@ var drawbridge = {
 
 				if( ! sendable ) return { message : 'Recipient has opted out — skipped.', request, response : { skipped : true }, skipped : true };
 
-				// A LIVE SUBSCRIPTION, in two reads. Free organizations get system mail
-				// only; a lead-facing send is a paid feature.
-				const organization = await read.get({ collection : 'organization', query : { id : workflow.organization } });
-
-				const subscription = organization?.subscription
-					? await read.get({ collection : 'subscription', query : { id : organization.subscription } })
-					: null;
-
-				if( subscription?.status !== 'active' ){
-
-					return {
-						message : 'Organization has no active subscription — workflow-step email skipped.',
-						request,
-						response : { skipped : true },
-						skipped : true
-					};
-
-				}
-
+				// NO SUBSCRIPTION CHECK. The send is billed as an action, so the plan's
+				// allowance is the entitlement and a free organization sends within its
+				// 200 like any other. Entries stop at the free cap before a workflow
+				// can fire on them, which is where the cap is enforced.
 				return {
 					message : 'Email queued for delivery to ' + to + '.',
 					request,

package/dist/connections/index.d.ts

@@ -2397,25 +2397,10 @@ var drawbridge = {
 
 				if( ! sendable ) return { message : 'Recipient has opted out — skipped.', request, response : { skipped : true }, skipped : true };
 
-				// A LIVE SUBSCRIPTION, in two reads. Free organizations get system mail
-				// only; a lead-facing send is a paid feature.
-				const organization = await read.get({ collection : 'organization', query : { id : workflow.organization } });
-
-				const subscription = organization?.subscription
-					? await read.get({ collection : 'subscription', query : { id : organization.subscription } })
-					: null;
-
-				if( subscription?.status !== 'active' ){
-
-					return {
-						message : 'Organization has no active subscription — workflow-step email skipped.',
-						request,
-						response : { skipped : true },
-						skipped : true
-					};
-
-				}
-
+				// NO SUBSCRIPTION CHECK. The send is billed as an action, so the plan's
+				// allowance is the entitlement and a free organization sends within its
+				// 200 like any other. Entries stop at the free cap before a workflow
+				// can fire on them, which is where the cap is enforced.
 				return {
 					message : 'Email queued for delivery to ' + to + '.',
 					request,

package/dist/connections/index.js

@@ -1538,10 +1538,10 @@ var free = {
 };
 var plans = {
   DB00002: {
-    // A verified sending domain is a PAID capability: free plans cannot send
-    // lead-facing email at all (the send path gates on an active
-    // subscription), so granting it there would offer a domain that can
-    // never send from.
+    // A verified sending domain is a PAID capability. Every plan sends
+    // lead-facing email from the platform address — the send is billed as an
+    // action, so the allowance is the entitlement — and sending from your own
+    // domain is what the paid tiers add on top.
     features: all.features([organization.networking.key, organization.members.key]),
     limits: all.limits({ actions: 5e3, members: 3, storage: gigabyte * 10 }),
     marketing: {
@@ -2145,16 +2145,6 @@ var drawbridge_default2 = {
         const request2 = { to };
         const { ok: sendable } = await canSend({ channel: "email", to });
         if (!sendable) return { message: "Recipient has opted out \u2014 skipped.", request: request2, response: { skipped: true }, skipped: true };
-        const organization2 = await read.get({ collection: "organization", query: { id: workflow.organization } });
-        const subscription = (organization2 == null ? void 0 : organization2.subscription) ? await read.get({ collection: "subscription", query: { id: organization2.subscription } }) : null;
-        if ((subscription == null ? void 0 : subscription.status) !== "active") {
-          return {
-            message: "Organization has no active subscription \u2014 workflow-step email skipped.",
-            request: request2,
-            response: { skipped: true },
-            skipped: true
-          };
-        }
         return {
           message: "Email queued for delivery to " + to + ".",
           request: request2,

package/dist/plans.cjs

@@ -360,10 +360,10 @@ var free = {
 };
 var plans = {
   DB00002: {
-    // A verified sending domain is a PAID capability: free plans cannot send
-    // lead-facing email at all (the send path gates on an active
-    // subscription), so granting it there would offer a domain that can
-    // never send from.
+    // A verified sending domain is a PAID capability. Every plan sends
+    // lead-facing email from the platform address — the send is billed as an
+    // action, so the allowance is the entitlement — and sending from your own
+    // domain is what the paid tiers add on top.
     features: all.features([organization.networking.key, organization.members.key]),
     limits: all.limits({ actions: 5e3, members: 3, storage: gigabyte * 10 }),
     marketing: {

package/dist/plans.d.cts

@@ -121,10 +121,10 @@ const free = {
 
 const plans = {
 	DB00002 : {
-		// A verified sending domain is a PAID capability: free plans cannot send
-		// lead-facing email at all (the send path gates on an active
-		// subscription), so granting it there would offer a domain that can
-		// never send from.
+		// A verified sending domain is a PAID capability. Every plan sends
+		// lead-facing email from the platform address — the send is billed as an
+		// action, so the allowance is the entitlement — and sending from your own
+		// domain is what the paid tiers add on top.
 		features : all.features([ organization.networking.key, organization.members.key ]),
 		limits : all.limits({ actions : 5000, members : 3, storage : gigabyte * 10 }),
 		marketing : {

package/dist/plans.d.ts

@@ -121,10 +121,10 @@ const free = {
 
 const plans = {
 	DB00002 : {
-		// A verified sending domain is a PAID capability: free plans cannot send
-		// lead-facing email at all (the send path gates on an active
-		// subscription), so granting it there would offer a domain that can
-		// never send from.
+		// A verified sending domain is a PAID capability. Every plan sends
+		// lead-facing email from the platform address — the send is billed as an
+		// action, so the allowance is the entitlement — and sending from your own
+		// domain is what the paid tiers add on top.
 		features : all.features([ organization.networking.key, organization.members.key ]),
 		limits : all.limits({ actions : 5000, members : 3, storage : gigabyte * 10 }),
 		marketing : {

package/dist/plans.js

@@ -321,10 +321,10 @@ var free = {
 };
 var plans = {
   DB00002: {
-    // A verified sending domain is a PAID capability: free plans cannot send
-    // lead-facing email at all (the send path gates on an active
-    // subscription), so granting it there would offer a domain that can
-    // never send from.
+    // A verified sending domain is a PAID capability. Every plan sends
+    // lead-facing email from the platform address — the send is billed as an
+    // action, so the allowance is the entitlement — and sending from your own
+    // domain is what the paid tiers add on top.
     features: all.features([organization.networking.key, organization.members.key]),
     limits: all.limits({ actions: 5e3, members: 3, storage: gigabyte * 10 }),
     marketing: {

package/dist/pricing.cjs

@@ -651,10 +651,10 @@ var free = {
 };
 var plans = {
   DB00002: {
-    // A verified sending domain is a PAID capability: free plans cannot send
-    // lead-facing email at all (the send path gates on an active
-    // subscription), so granting it there would offer a domain that can
-    // never send from.
+    // A verified sending domain is a PAID capability. Every plan sends
+    // lead-facing email from the platform address — the send is billed as an
+    // action, so the allowance is the entitlement — and sending from your own
+    // domain is what the paid tiers add on top.
     features: all.features([organization.networking.key, organization.members.key]),
     limits: all.limits({ actions: 5e3, members: 3, storage: gigabyte * 10 }),
     marketing: {

package/dist/pricing.js

@@ -599,10 +599,10 @@ var free = {
 };
 var plans = {
   DB00002: {
-    // A verified sending domain is a PAID capability: free plans cannot send
-    // lead-facing email at all (the send path gates on an active
-    // subscription), so granting it there would offer a domain that can
-    // never send from.
+    // A verified sending domain is a PAID capability. Every plan sends
+    // lead-facing email from the platform address — the send is billed as an
+    // action, so the allowance is the entitlement — and sending from your own
+    // domain is what the paid tiers add on top.
     features: all.features([organization.networking.key, organization.members.key]),
     limits: all.limits({ actions: 5e3, members: 3, storage: gigabyte * 10 }),
     marketing: {

package/dist/providers.cjs

@@ -1523,10 +1523,10 @@ var free = {
 };
 var plans = {
   DB00002: {
-    // A verified sending domain is a PAID capability: free plans cannot send
-    // lead-facing email at all (the send path gates on an active
-    // subscription), so granting it there would offer a domain that can
-    // never send from.
+    // A verified sending domain is a PAID capability. Every plan sends
+    // lead-facing email from the platform address — the send is billed as an
+    // action, so the allowance is the entitlement — and sending from your own
+    // domain is what the paid tiers add on top.
     features: all.features([organization.networking.key, organization.members.key]),
     limits: all.limits({ actions: 5e3, members: 3, storage: gigabyte * 10 }),
     marketing: {
@@ -2130,16 +2130,6 @@ var drawbridge_default2 = {
         const request2 = { to };
         const { ok: sendable } = await canSend({ channel: "email", to });
         if (!sendable) return { message: "Recipient has opted out \u2014 skipped.", request: request2, response: { skipped: true }, skipped: true };
-        const organization2 = await read.get({ collection: "organization", query: { id: workflow.organization } });
-        const subscription = (organization2 == null ? void 0 : organization2.subscription) ? await read.get({ collection: "subscription", query: { id: organization2.subscription } }) : null;
-        if ((subscription == null ? void 0 : subscription.status) !== "active") {
-          return {
-            message: "Organization has no active subscription \u2014 workflow-step email skipped.",
-            request: request2,
-            response: { skipped: true },
-            skipped: true
-          };
-        }
         return {
           message: "Email queued for delivery to " + to + ".",
           request: request2,

package/dist/providers.js

@@ -1474,10 +1474,10 @@ var free = {
 };
 var plans = {
   DB00002: {
-    // A verified sending domain is a PAID capability: free plans cannot send
-    // lead-facing email at all (the send path gates on an active
-    // subscription), so granting it there would offer a domain that can
-    // never send from.
+    // A verified sending domain is a PAID capability. Every plan sends
+    // lead-facing email from the platform address — the send is billed as an
+    // action, so the allowance is the entitlement — and sending from your own
+    // domain is what the paid tiers add on top.
     features: all.features([organization.networking.key, organization.members.key]),
     limits: all.limits({ actions: 5e3, members: 3, storage: gigabyte * 10 }),
     marketing: {
@@ -2081,16 +2081,6 @@ var drawbridge_default2 = {
         const request2 = { to };
         const { ok: sendable } = await canSend({ channel: "email", to });
         if (!sendable) return { message: "Recipient has opted out \u2014 skipped.", request: request2, response: { skipped: true }, skipped: true };
-        const organization2 = await read.get({ collection: "organization", query: { id: workflow.organization } });
-        const subscription = (organization2 == null ? void 0 : organization2.subscription) ? await read.get({ collection: "subscription", query: { id: organization2.subscription } }) : null;
-        if ((subscription == null ? void 0 : subscription.status) !== "active") {
-          return {
-            message: "Organization has no active subscription \u2014 workflow-step email skipped.",
-            request: request2,
-            response: { skipped: true },
-            skipped: true
-          };
-        }
         return {
           message: "Email queued for delivery to " + to + ".",
           request: request2,

package/dist/sendgrid.cjs

@@ -142,14 +142,27 @@ var domain = {
   // Asks SendGrid to look the records up now. `records` carries per-record
   // validity so a UI can say WHICH record has not landed rather than only that
   // something has not; `valid` is the whole domain's verdict.
+  //
+  // TWO CALLS, because SendGrid splits the answer. POST …/validate is what
+  // makes it look DNS up now, and it answers per KEY with only `valid` and
+  // `reason` — no host, type or data (docs: validation_results.mail_cname /
+  // dkim1 / dkim2 / spf, each { valid, reason }). The rows themselves live on
+  // the domain, GET …/domains/:id, keyed the same way with host/type/data
+  // (and a `valid` of its own, which the validate verdict overrides). Feeding
+  // validation_results straight to dnsRows filtered every entry out for want
+  // of a host, so this returned `records : []` and no check ever updated a
+  // record — the verdicts on screen were the ones from registration.
   validate: async ({ apiKey, reference, via = sendgridRequest }) => {
-    const result = await via({
-      apiKey,
-      method: "POST",
-      path: "/v3/whitelabel/domains/" + encodeURIComponent(reference) + "/validate"
-    });
+    const path = "/v3/whitelabel/domains/" + encodeURIComponent(reference);
+    const result = await via({ apiKey, method: "POST", path: path + "/validate" });
+    const doc = await via({ apiKey, method: "GET", path });
+    const verdicts = (result == null ? void 0 : result.validation_results) || {};
+    const merged = Object.fromEntries(Object.entries((doc == null ? void 0 : doc.dns) || {}).map(([key, row]) => [
+      key,
+      { ...row, ...verdicts[key] && { reason: verdicts[key].reason, valid: verdicts[key].valid } }
+    ]));
     return {
-      records: dnsRows(result == null ? void 0 : result.validation_results),
+      records: dnsRows(merged),
       valid: Boolean(result == null ? void 0 : result.valid)
     };
   }

package/dist/sendgrid.d.cts

@@ -169,16 +169,33 @@ const domain = {
 	// Asks SendGrid to look the records up now. `records` carries per-record
 	// validity so a UI can say WHICH record has not landed rather than only that
 	// something has not; `valid` is the whole domain's verdict.
+	//
+	// TWO CALLS, because SendGrid splits the answer. POST …/validate is what
+	// makes it look DNS up now, and it answers per KEY with only `valid` and
+	// `reason` — no host, type or data (docs: validation_results.mail_cname /
+	// dkim1 / dkim2 / spf, each { valid, reason }). The rows themselves live on
+	// the domain, GET …/domains/:id, keyed the same way with host/type/data
+	// (and a `valid` of its own, which the validate verdict overrides). Feeding
+	// validation_results straight to dnsRows filtered every entry out for want
+	// of a host, so this returned `records : []` and no check ever updated a
+	// record — the verdicts on screen were the ones from registration.
 	validate : async ({ apiKey, reference, via = sendgridRequest }) => {
 
-		const result = await via({
-			apiKey,
-			method : 'POST',
-			path : '/v3/whitelabel/domains/' + encodeURIComponent( reference ) + '/validate'
-		});
+		const path = '/v3/whitelabel/domains/' + encodeURIComponent( reference );
+
+		const result = await via({ apiKey, method : 'POST', path : path + '/validate' });
+		const doc = await via({ apiKey, method : 'GET', path });
+
+		const verdicts = result?.validation_results || {};
+
+		// `spf` has a verdict but no row; the host/type filter in dnsRows drops it.
+		const merged = Object.fromEntries( Object.entries( doc?.dns || {} ).map( ( [ key, row ] ) => [
+			key,
+			{ ...row, ...( verdicts[ key ] && { reason : verdicts[ key ].reason, valid : verdicts[ key ].valid } ) }
+		] ) );
 
 		return {
-			records : dnsRows( result?.validation_results ),
+			records : dnsRows( merged ),
 			valid : Boolean( result?.valid )
 		};
 

package/dist/sendgrid.d.ts

@@ -169,16 +169,33 @@ const domain = {
 	// Asks SendGrid to look the records up now. `records` carries per-record
 	// validity so a UI can say WHICH record has not landed rather than only that
 	// something has not; `valid` is the whole domain's verdict.
+	//
+	// TWO CALLS, because SendGrid splits the answer. POST …/validate is what
+	// makes it look DNS up now, and it answers per KEY with only `valid` and
+	// `reason` — no host, type or data (docs: validation_results.mail_cname /
+	// dkim1 / dkim2 / spf, each { valid, reason }). The rows themselves live on
+	// the domain, GET …/domains/:id, keyed the same way with host/type/data
+	// (and a `valid` of its own, which the validate verdict overrides). Feeding
+	// validation_results straight to dnsRows filtered every entry out for want
+	// of a host, so this returned `records : []` and no check ever updated a
+	// record — the verdicts on screen were the ones from registration.
 	validate : async ({ apiKey, reference, via = sendgridRequest }) => {
 
-		const result = await via({
-			apiKey,
-			method : 'POST',
-			path : '/v3/whitelabel/domains/' + encodeURIComponent( reference ) + '/validate'
-		});
+		const path = '/v3/whitelabel/domains/' + encodeURIComponent( reference );
+
+		const result = await via({ apiKey, method : 'POST', path : path + '/validate' });
+		const doc = await via({ apiKey, method : 'GET', path });
+
+		const verdicts = result?.validation_results || {};
+
+		// `spf` has a verdict but no row; the host/type filter in dnsRows drops it.
+		const merged = Object.fromEntries( Object.entries( doc?.dns || {} ).map( ( [ key, row ] ) => [
+			key,
+			{ ...row, ...( verdicts[ key ] && { reason : verdicts[ key ].reason, valid : verdicts[ key ].valid } ) }
+		] ) );
 
 		return {
-			records : dnsRows( result?.validation_results ),
+			records : dnsRows( merged ),
 			valid : Boolean( result?.valid )
 		};
 

package/dist/sendgrid.js

@@ -113,14 +113,27 @@ var domain = {
   // Asks SendGrid to look the records up now. `records` carries per-record
   // validity so a UI can say WHICH record has not landed rather than only that
   // something has not; `valid` is the whole domain's verdict.
+  //
+  // TWO CALLS, because SendGrid splits the answer. POST …/validate is what
+  // makes it look DNS up now, and it answers per KEY with only `valid` and
+  // `reason` — no host, type or data (docs: validation_results.mail_cname /
+  // dkim1 / dkim2 / spf, each { valid, reason }). The rows themselves live on
+  // the domain, GET …/domains/:id, keyed the same way with host/type/data
+  // (and a `valid` of its own, which the validate verdict overrides). Feeding
+  // validation_results straight to dnsRows filtered every entry out for want
+  // of a host, so this returned `records : []` and no check ever updated a
+  // record — the verdicts on screen were the ones from registration.
   validate: async ({ apiKey, reference, via = sendgridRequest }) => {
-    const result = await via({
-      apiKey,
-      method: "POST",
-      path: "/v3/whitelabel/domains/" + encodeURIComponent(reference) + "/validate"
-    });
+    const path = "/v3/whitelabel/domains/" + encodeURIComponent(reference);
+    const result = await via({ apiKey, method: "POST", path: path + "/validate" });
+    const doc = await via({ apiKey, method: "GET", path });
+    const verdicts = (result == null ? void 0 : result.validation_results) || {};
+    const merged = Object.fromEntries(Object.entries((doc == null ? void 0 : doc.dns) || {}).map(([key, row]) => [
+      key,
+      { ...row, ...verdicts[key] && { reason: verdicts[key].reason, valid: verdicts[key].valid } }
+    ]));
     return {
-      records: dnsRows(result == null ? void 0 : result.validation_results),
+      records: dnsRows(merged),
       valid: Boolean(result == null ? void 0 : result.valid)
     };
   }

package/package.json

@@ -226,5 +226,5 @@
     "prepublishOnly": ". \"$HOME/.nvm/nvm.sh\" && nvm use && tsup && node --test"
   },
   "types": "dist/index.d.ts",
-  "version": "0.0.166"
+  "version": "0.0.168"
 }