@drawbridge/drawbridge-utils 0.0.112 → 0.0.115

package/dist/connections/oauth.js

@@ -1,11 +1,11 @@
 // lib/connections/oauth.js
 import { createHash, randomBytes } from "crypto";
-var credentials = ({ clientId, clientSecret, descriptor }) => (descriptor == null ? void 0 : descriptor.clientAuth) === "basic" ? {
-  headers: { authorization: "Basic " + Buffer.from(clientId + ":" + clientSecret).toString("base64") },
-  body: {}
+var credentials = ({ basic, clientId, clientSecret }) => basic ? {
+  body: {},
+  headers: { authorization: "Basic " + Buffer.from(clientId + ":" + clientSecret).toString("base64") }
 } : {
-  headers: {},
-  body: { client_id: clientId, client_secret: clientSecret }
+  body: { client_id: clientId, client_secret: clientSecret },
+  headers: {}
 };
 var pkcePair = () => {
   const verifier = randomBytes(32).toString("base64url");
@@ -16,10 +16,11 @@ var pkcePair = () => {
   };
 };
 var consentUrl = ({ challenge, clientId, descriptor, redirect, state } = {}) => {
+  var _a;
   if (!clientId) throw new Error("This deployment has no OAuth client configured, so there is nothing to consent through");
-  if (!(descriptor == null ? void 0 : descriptor.authorize)) throw new Error("This connection declares no authorize url");
+  if (!((_a = descriptor == null ? void 0 : descriptor.urls) == null ? void 0 : _a.authorize)) throw new Error("This connection declares no authorize url");
   if (descriptor.pkce && !challenge) throw new Error("This connection requires PKCE, so a code challenge is not optional");
-  return descriptor.authorize + "?" + new URLSearchParams({
+  return descriptor.urls.authorize + "?" + new URLSearchParams({
     // The descriptor's own params go FIRST, so a vendor quirk cannot quietly
     // overwrite one of the fields below that every consent carries.
     ...descriptor.params || {},
@@ -34,17 +35,33 @@ var consentUrl = ({ challenge, clientId, descriptor, redirect, state } = {}) =>
     state
   });
 };
-var exchange = async ({ clientId, clientSecret, code, descriptor, fetcher = fetch, redirect, verifier } = {}) => {
-  if (!(descriptor == null ? void 0 : descriptor.token)) throw new Error("This connection declares no token url");
-  if (descriptor.pkce && !verifier) throw new Error("This connection requires PKCE, so the code verifier is not optional");
-  const client = credentials({ clientId, clientSecret, descriptor });
-  const response = await fetcher(descriptor.token, {
+var authToken = async ({
+  basic,
+  clientId,
+  clientSecret,
+  code,
+  descriptor,
+  fetcher = fetch,
+  redirect,
+  refreshToken,
+  verifier
+} = {}) => {
+  var _a;
+  if (!clientId || !clientSecret) throw new Error("This deployment has no OAuth client configured, so no token can be minted");
+  if (!((_a = descriptor == null ? void 0 : descriptor.urls) == null ? void 0 : _a.token)) throw new Error("This connection declares no token url");
+  const renewing = !code;
+  if (renewing && !refreshToken) throw new Error("Nothing has been consented to yet, so there is no refresh token to spend");
+  if (!renewing && descriptor.pkce && !verifier) throw new Error("This connection requires PKCE, so the code verifier is not optional");
+  const client = credentials({ basic, clientId, clientSecret });
+  const response = await fetcher(descriptor.urls.token, {
     body: new URLSearchParams({
       ...client.body,
-      code: decodeURIComponent(String(code || "").trim()),
-      grant_type: "authorization_code",
-      redirect_uri: redirect,
-      ...descriptor.pkce && { code_verifier: verifier }
+      ...renewing ? { grant_type: "refresh_token", refresh_token: refreshToken } : {
+        code: decodeURIComponent(String(code || "").trim()),
+        grant_type: "authorization_code",
+        redirect_uri: redirect,
+        ...descriptor.pkce && { code_verifier: verifier }
+      }
     }),
     headers: { "content-type": "application/x-www-form-urlencoded", ...client.headers },
     method: "POST",
@@ -52,45 +69,28 @@ var exchange = async ({ clientId, clientSecret, code, descriptor, fetcher = fetc
   });
   const body = await response.json().catch(() => ({}));
   if (!response.ok) {
-    throw new Error("The vendor refused the exchange (" + response.status + ")" + ((body == null ? void 0 : body.error) ? ": " + body.error : ""));
+    throw new Error(
+      renewing ? "The vendor refused the refresh token (" + response.status + ") \u2014 reconnect the connection" : "The vendor refused the exchange (" + response.status + ")" + ((body == null ? void 0 : body.error) ? ": " + body.error : "")
+    );
   }
-  if (!body.access_token) throw new Error("The vendor returned no access token");
+  if (!renewing && !body.access_token) throw new Error("The vendor returned no access token");
   return {
     accessToken: body.access_token,
     expiresIn: body.expires_in || null,
+    // A REFRESH TOKEN IS NOT UNIVERSAL. Google returns one only with
+    // access_type=offline; Mailchimp's tokens do not expire and it returns none
+    // at all, so its absence cannot be an error here.
+    //
+    // On a RENEWAL the same null matters for the opposite reason: a vendor that
+    // rotates returns a new one, and dropping it silently invalidates the stored
+    // grant on the NEXT refresh — a failure a day late and nowhere near its
+    // cause. tokenSettings() keeps the existing one when this is null.
     refreshToken: body.refresh_token || null,
     scope: body.scope || null
   };
 };
-var refresh = async ({ clientId, clientSecret, descriptor, fetcher = fetch, refreshToken } = {}) => {
-  if (!clientId || !clientSecret) throw new Error("This deployment has no OAuth client configured, so no token can be minted");
-  if (!refreshToken) throw new Error("Nothing has been consented to yet, so there is no refresh token to spend");
-  if (!(descriptor == null ? void 0 : descriptor.token)) throw new Error("This connection declares no token url");
-  const client = credentials({ clientId, clientSecret, descriptor });
-  const response = await fetcher(descriptor.token, {
-    body: new URLSearchParams({
-      ...client.body,
-      grant_type: "refresh_token",
-      refresh_token: refreshToken
-    }),
-    headers: { "content-type": "application/x-www-form-urlencoded", ...client.headers },
-    method: "POST",
-    signal: AbortSignal.timeout(15e3)
-  });
-  if (!response.ok) throw new Error("The vendor refused the refresh token (" + response.status + ") \u2014 reconnect the connection");
-  const body = await response.json();
-  return {
-    accessToken: body.access_token,
-    expiresIn: body.expires_in || null,
-    // A vendor that rotates its refresh token returns a new one, and dropping
-    // it silently invalidates the stored grant on the NEXT refresh rather
-    // than this one — a failure a day late and nowhere near its cause.
-    refreshToken: body.refresh_token || null
-  };
-};
 export {
+  authToken,
   consentUrl,
-  exchange,
-  pkcePair,
-  refresh
+  pkcePair
 };

package/dist/features.cjs

@@ -94,6 +94,21 @@ var field = {
   }
 };
 var connection = {
+  attentive: {
+    key: "organization:connection:attentive",
+    error: "Plan does not include Attentive connection",
+    feature: "Attentive connection"
+  },
+  // Klaviyo shipped without an entry here, which meant no plan GRANTED its
+  // key and the feature gate denied every non-admin request — a latent 403
+  // found while adding Attentive. getPlanFeature answers granted:false for a
+  // key absent from the plan's map, so a manifest feature key that appears in
+  // no plan list is a connection only admins can manage.
+  klaviyo: {
+    key: "organization:connection:klaviyo",
+    error: "Plan does not include Klaviyo connection",
+    feature: "Klaviyo connection"
+  },
   mailchimp: {
     key: "organization:connection:mailchimp",
     error: "Plan does not include Mailchimp connection",

package/dist/features.d.cts

@@ -68,6 +68,21 @@ const field = {
 };
 
 const connection = {
+	attentive : {
+		key : 'organization:connection:attentive',
+		error : 'Plan does not include Attentive connection',
+		feature : 'Attentive connection'
+	},
+	// Klaviyo shipped without an entry here, which meant no plan GRANTED its
+	// key and the feature gate denied every non-admin request — a latent 403
+	// found while adding Attentive. getPlanFeature answers granted:false for a
+	// key absent from the plan's map, so a manifest feature key that appears in
+	// no plan list is a connection only admins can manage.
+	klaviyo : {
+		key : 'organization:connection:klaviyo',
+		error : 'Plan does not include Klaviyo connection',
+		feature : 'Klaviyo connection'
+	},
 	mailchimp : {
 		key : 'organization:connection:mailchimp',
 		error : 'Plan does not include Mailchimp connection',

package/dist/features.d.ts

@@ -68,6 +68,21 @@ const field = {
 };
 
 const connection = {
+	attentive : {
+		key : 'organization:connection:attentive',
+		error : 'Plan does not include Attentive connection',
+		feature : 'Attentive connection'
+	},
+	// Klaviyo shipped without an entry here, which meant no plan GRANTED its
+	// key and the feature gate denied every non-admin request — a latent 403
+	// found while adding Attentive. getPlanFeature answers granted:false for a
+	// key absent from the plan's map, so a manifest feature key that appears in
+	// no plan list is a connection only admins can manage.
+	klaviyo : {
+		key : 'organization:connection:klaviyo',
+		error : 'Plan does not include Klaviyo connection',
+		feature : 'Klaviyo connection'
+	},
 	mailchimp : {
 		key : 'organization:connection:mailchimp',
 		error : 'Plan does not include Mailchimp connection',

package/dist/features.js

@@ -66,6 +66,21 @@ var field = {
   }
 };
 var connection = {
+  attentive: {
+    key: "organization:connection:attentive",
+    error: "Plan does not include Attentive connection",
+    feature: "Attentive connection"
+  },
+  // Klaviyo shipped without an entry here, which meant no plan GRANTED its
+  // key and the feature gate denied every non-admin request — a latent 403
+  // found while adding Attentive. getPlanFeature answers granted:false for a
+  // key absent from the plan's map, so a manifest feature key that appears in
+  // no plan list is a connection only admins can manage.
+  klaviyo: {
+    key: "organization:connection:klaviyo",
+    error: "Plan does not include Klaviyo connection",
+    feature: "Klaviyo connection"
+  },
   mailchimp: {
     key: "organization:connection:mailchimp",
     error: "Plan does not include Mailchimp connection",

package/dist/fields-validate.js

@@ -1,5 +1,5 @@
 // lib/phone.js
-import { parsePhoneNumberFromString, isValidPhoneNumber } from "libphonenumber-js";
+import { AsYouType, parsePhoneNumberFromString, isValidPhoneNumber } from "libphonenumber-js";
 var isValid = (value, country) => {
   if (!value) return false;
   try {

package/dist/phone.cjs

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // lib/phone.js
 var phone_exports = {};
 __export(phone_exports, {
+  detectCountry: () => detectCountry,
   isValid: () => isValid,
   toE164: () => toE164
 });
@@ -33,6 +34,16 @@ var toE164 = (value, country) => {
     return null;
   }
 };
+var detectCountry = (value) => {
+  if (!value) return null;
+  try {
+    const parser = new import_libphonenumber_js.AsYouType();
+    parser.input(String(value));
+    return parser.getCountry() || null;
+  } catch {
+    return null;
+  }
+};
 var isValid = (value, country) => {
   if (!value) return false;
   try {
@@ -43,6 +54,7 @@ var isValid = (value, country) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  detectCountry,
   isValid,
   toE164
 });

package/dist/phone.d.cts

@@ -1,4 +1,4 @@
-import { isValidPhoneNumber, parsePhoneNumberFromString } from 'libphonenumber-js';
+import { AsYouType, isValidPhoneNumber, parsePhoneNumberFromString } from 'libphonenumber-js';
 
 // Canonicalize a phone value to E.164 (e.g. '+15551234567'), or null if it cannot
 // be parsed. `country` (ISO 3166-1 alpha-2, e.g. 'US') is only needed for
@@ -24,6 +24,34 @@ const toE164 = ( value, country ) => {
 
 };
 
+// Resolve which country an entered number belongs to (ISO 3166-1 alpha-2), or null
+// while it is still ambiguous. Backs the country selector on phone fields, which
+// follows the number the visitor types rather than asking them to set it first.
+// libphonenumber only commits to a country once the number is COMPLETE: '+1604…'
+// stays null until the final digit because Canada and the US share the +1 calling
+// code and are told apart by area code. Callers MUST treat null as "leave the
+// current selection alone" — never as "reset it" — or every keystroke short of a
+// finished number would wipe the visitor's country.
+const detectCountry = ( value ) => {
+
+	if( ! value ) return null;
+
+	try {
+
+		const parser = new AsYouType();
+
+		parser.input( String( value ) );
+
+		return parser.getCountry() || null;
+
+	} catch {
+
+		return null;
+
+	}
+
+};
+
 // Strict validity check (wraps libphonenumber-js). Mirrors the validation
 // drawbridge-api's submission route already performs on lead phone input.
 const isValid = ( value, country ) => {
@@ -42,4 +70,4 @@ const isValid = ( value, country ) => {
 
 };
 
-export { isValid, toE164 };
+export { detectCountry, isValid, toE164 };

package/dist/phone.d.ts

@@ -1,4 +1,4 @@
-import { isValidPhoneNumber, parsePhoneNumberFromString } from 'libphonenumber-js';
+import { AsYouType, isValidPhoneNumber, parsePhoneNumberFromString } from 'libphonenumber-js';
 
 // Canonicalize a phone value to E.164 (e.g. '+15551234567'), or null if it cannot
 // be parsed. `country` (ISO 3166-1 alpha-2, e.g. 'US') is only needed for
@@ -24,6 +24,34 @@ const toE164 = ( value, country ) => {
 
 };
 
+// Resolve which country an entered number belongs to (ISO 3166-1 alpha-2), or null
+// while it is still ambiguous. Backs the country selector on phone fields, which
+// follows the number the visitor types rather than asking them to set it first.
+// libphonenumber only commits to a country once the number is COMPLETE: '+1604…'
+// stays null until the final digit because Canada and the US share the +1 calling
+// code and are told apart by area code. Callers MUST treat null as "leave the
+// current selection alone" — never as "reset it" — or every keystroke short of a
+// finished number would wipe the visitor's country.
+const detectCountry = ( value ) => {
+
+	if( ! value ) return null;
+
+	try {
+
+		const parser = new AsYouType();
+
+		parser.input( String( value ) );
+
+		return parser.getCountry() || null;
+
+	} catch {
+
+		return null;
+
+	}
+
+};
+
 // Strict validity check (wraps libphonenumber-js). Mirrors the validation
 // drawbridge-api's submission route already performs on lead phone input.
 const isValid = ( value, country ) => {
@@ -42,4 +70,4 @@ const isValid = ( value, country ) => {
 
 };
 
-export { isValid, toE164 };
+export { detectCountry, isValid, toE164 };

package/dist/phone.js

@@ -1,5 +1,5 @@
 // lib/phone.js
-import { parsePhoneNumberFromString, isValidPhoneNumber } from "libphonenumber-js";
+import { AsYouType, parsePhoneNumberFromString, isValidPhoneNumber } from "libphonenumber-js";
 var toE164 = (value, country) => {
   if (!value) return null;
   try {
@@ -9,6 +9,16 @@ var toE164 = (value, country) => {
     return null;
   }
 };
+var detectCountry = (value) => {
+  if (!value) return null;
+  try {
+    const parser = new AsYouType();
+    parser.input(String(value));
+    return parser.getCountry() || null;
+  } catch {
+    return null;
+  }
+};
 var isValid = (value, country) => {
   if (!value) return false;
   try {
@@ -18,6 +28,7 @@ var isValid = (value, country) => {
   }
 };
 export {
+  detectCountry,
   isValid,
   toE164
 };

package/dist/plans.cjs

@@ -105,6 +105,21 @@ var field = {
   }
 };
 var connection = {
+  attentive: {
+    key: "organization:connection:attentive",
+    error: "Plan does not include Attentive connection",
+    feature: "Attentive connection"
+  },
+  // Klaviyo shipped without an entry here, which meant no plan GRANTED its
+  // key and the feature gate denied every non-admin request — a latent 403
+  // found while adding Attentive. getPlanFeature answers granted:false for a
+  // key absent from the plan's map, so a manifest feature key that appears in
+  // no plan list is a connection only admins can manage.
+  klaviyo: {
+    key: "organization:connection:klaviyo",
+    error: "Plan does not include Klaviyo connection",
+    feature: "Klaviyo connection"
+  },
   mailchimp: {
     key: "organization:connection:mailchimp",
     error: "Plan does not include Mailchimp connection",
@@ -287,6 +302,8 @@ var unitAmountDecimal = (cents) => {
 };
 var all = {
   features: (array = []) => featuresFor([
+    connection.attentive.key,
+    connection.klaviyo.key,
     connection.mailchimp.key,
     connection.sendgrid.key,
     connection.shopify.key,

package/dist/plans.d.cts

@@ -67,6 +67,8 @@ const unitAmountDecimal = ( cents ) => {
 
 const all = {
 	features : ( array = [] ) => featuresFor([
+		connection.attentive.key,
+		connection.klaviyo.key,
 		connection.mailchimp.key,
 		connection.sendgrid.key,
 		connection.shopify.key,

package/dist/plans.d.ts

@@ -67,6 +67,8 @@ const unitAmountDecimal = ( cents ) => {
 
 const all = {
 	features : ( array = [] ) => featuresFor([
+		connection.attentive.key,
+		connection.klaviyo.key,
 		connection.mailchimp.key,
 		connection.sendgrid.key,
 		connection.shopify.key,

package/dist/plans.js

@@ -66,6 +66,21 @@ var field = {
   }
 };
 var connection = {
+  attentive: {
+    key: "organization:connection:attentive",
+    error: "Plan does not include Attentive connection",
+    feature: "Attentive connection"
+  },
+  // Klaviyo shipped without an entry here, which meant no plan GRANTED its
+  // key and the feature gate denied every non-admin request — a latent 403
+  // found while adding Attentive. getPlanFeature answers granted:false for a
+  // key absent from the plan's map, so a manifest feature key that appears in
+  // no plan list is a connection only admins can manage.
+  klaviyo: {
+    key: "organization:connection:klaviyo",
+    error: "Plan does not include Klaviyo connection",
+    feature: "Klaviyo connection"
+  },
   mailchimp: {
     key: "organization:connection:mailchimp",
     error: "Plan does not include Mailchimp connection",
@@ -248,6 +263,8 @@ var unitAmountDecimal = (cents) => {
 };
 var all = {
   features: (array = []) => featuresFor([
+    connection.attentive.key,
+    connection.klaviyo.key,
     connection.mailchimp.key,
     connection.sendgrid.key,
     connection.shopify.key,

package/dist/pricing.cjs

@@ -116,6 +116,21 @@ var field = {
   }
 };
 var connection = {
+  attentive: {
+    key: "organization:connection:attentive",
+    error: "Plan does not include Attentive connection",
+    feature: "Attentive connection"
+  },
+  // Klaviyo shipped without an entry here, which meant no plan GRANTED its
+  // key and the feature gate denied every non-admin request — a latent 403
+  // found while adding Attentive. getPlanFeature answers granted:false for a
+  // key absent from the plan's map, so a manifest feature key that appears in
+  // no plan list is a connection only admins can manage.
+  klaviyo: {
+    key: "organization:connection:klaviyo",
+    error: "Plan does not include Klaviyo connection",
+    feature: "Klaviyo connection"
+  },
   mailchimp: {
     key: "organization:connection:mailchimp",
     error: "Plan does not include Mailchimp connection",
@@ -298,6 +313,8 @@ var unitAmountDecimal = (cents) => {
 };
 var all = {
   features: (array = []) => featuresFor([
+    connection.attentive.key,
+    connection.klaviyo.key,
     connection.mailchimp.key,
     connection.sendgrid.key,
     connection.shopify.key,

package/dist/pricing.js

@@ -66,6 +66,21 @@ var field = {
   }
 };
 var connection = {
+  attentive: {
+    key: "organization:connection:attentive",
+    error: "Plan does not include Attentive connection",
+    feature: "Attentive connection"
+  },
+  // Klaviyo shipped without an entry here, which meant no plan GRANTED its
+  // key and the feature gate denied every non-admin request — a latent 403
+  // found while adding Attentive. getPlanFeature answers granted:false for a
+  // key absent from the plan's map, so a manifest feature key that appears in
+  // no plan list is a connection only admins can manage.
+  klaviyo: {
+    key: "organization:connection:klaviyo",
+    error: "Plan does not include Klaviyo connection",
+    feature: "Klaviyo connection"
+  },
   mailchimp: {
     key: "organization:connection:mailchimp",
     error: "Plan does not include Mailchimp connection",
@@ -248,6 +263,8 @@ var unitAmountDecimal = (cents) => {
 };
 var all = {
   features: (array = []) => featuresFor([
+    connection.attentive.key,
+    connection.klaviyo.key,
     connection.mailchimp.key,
     connection.sendgrid.key,
     connection.shopify.key,

package/dist/safe-http.d.cts

@@ -1,7 +1,7 @@
 import dns from 'dns';
 import * as http from 'node:http';
 import * as https from 'node:https';
-import { isBlockedIP, axios } from './axios.cjs';
+import { axios, isBlockedIP } from './axios.cjs';
 import 'axios';
 import 'net';
 

package/dist/safe-http.d.ts

@@ -1,7 +1,7 @@
 import dns from 'dns';
 import * as http from 'node:http';
 import * as https from 'node:https';
-import { isBlockedIP, axios } from './axios.js';
+import { axios, isBlockedIP } from './axios.js';
 import 'axios';
 import 'net';