@drawbridge/drawbridge-utils 0.0.142 → 0.0.144

package/dist/providers.js

@@ -3228,6 +3228,45 @@ var toCanonicalEmail = (value) => {
   return local + "@" + domain;
 };
 
+// lib/encrypt.js
+import crypto2 from "crypto";
+
+// lib/token.js
+import crypto from "crypto";
+var generate = (bytes = 32, encoding = "base64url") => {
+  const buf = crypto.randomBytes(bytes);
+  return encoding ? buf.toString(encoding) : buf;
+};
+
+// lib/encrypt.js
+var ALGORITHM = "aes-256-gcm";
+var getKey = () => Buffer.from(process.env.ENCRYPT_CONNECTION_SECRET, "hex");
+var encrypt = (value) => {
+  const iv = generate(12, null);
+  const cipher = crypto2.createCipheriv(ALGORITHM, getKey(), iv);
+  const data2 = Buffer.concat([
+    cipher.update(JSON.stringify(value), "utf8"),
+    cipher.final()
+  ]);
+  const tag = cipher.getAuthTag();
+  return [iv, tag, data2].map((b) => b.toString("hex")).join(":");
+};
+var decrypt = (value) => {
+  if (typeof value !== "string") return value;
+  const [ivHex, tagHex, dataHex] = value.split(":");
+  const decipher = crypto2.createDecipheriv(
+    ALGORITHM,
+    getKey(),
+    Buffer.from(ivHex, "hex")
+  );
+  decipher.setAuthTag(Buffer.from(tagHex, "hex"));
+  const result = Buffer.concat([
+    decipher.update(Buffer.from(dataHex, "hex")),
+    decipher.final()
+  ]);
+  return JSON.parse(result.toString("utf8"));
+};
+
 // lib/slugify.js
 import slug from "slugify";
 var slugify = (value, nochars = false) => {
@@ -3282,6 +3321,8 @@ var generateDiscountCode = customAlphabet2("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ
 var ORDER_EVENT_HANDLE = slugify("drawbridge-orders");
 var REFRESH_TOKEN_FRESHNESS_BUFFER_MS = 5 * 24 * 60 * 60 * 1e3;
 var OAUTH_ERROR_SOURCE = "oauth";
+var BILLING_ERROR_SOURCE = "billing";
+var BILLING_ERROR_MESSAGE = "Order billing isn't set up for this store \u2014 reselect and approve the plan from the Shopify connection page.";
 var OAUTH_GRANT_REVOKED_CODES = ["application_cannot_be_found", "invalid_grant"];
 var inbound = {
   headers: {
@@ -3802,6 +3843,9 @@ var shopify_default2 = {
           }
         }
         const billable = (org == null ? void 0 : org.billingProvider) === "shopify" && fee > 0 && !backfill;
+        const providerRow = billable ? await read.get({ collection: "provider", query: { slug: "shopify" } }) : null;
+        const { orderEventHandle } = (providerRow == null ? void 0 : providerRow.settings) ? decrypt(providerRow.settings) : {};
+        const handle = typeof orderEventHandle === "string" && slugify(orderEventHandle) || ORDER_EVENT_HANDLE;
         if (billable && !((_f = connection2 == null ? void 0 : connection2.source) == null ? void 0 : _f.id)) {
           (_g = logger2 == null ? void 0 : logger2.error) == null ? void 0 : _g.call(logger2, new Error(
             "shopify.usage.billing.skipped on order " + orderId + ": " + Math.round(fee * 100) + " cents not billed \u2014 connection " + (connection2 == null ? void 0 : connection2.id) + " has no source.id"
@@ -3820,7 +3864,7 @@ var shopify_default2 = {
             // verify it against the transaction prefix and refuse a
             // drifted pair — idempotency keys are permanent, so a
             // mistraceable event can never be resent under its own key.
-            handle: ORDER_EVENT_HANDLE,
+            handle,
             idempotencyKey: String(orderId),
             orderDocId,
             orderId: String(orderId),
@@ -3830,7 +3874,7 @@ var shopify_default2 = {
             // here — the event handle plus the order id — and sent as the
             // event's `reference`. queue/usage.js stamps the same id onto
             // the order as billed.transaction.
-            transaction: ORDER_EVENT_HANDLE + "." + orderId,
+            transaction: handle + "." + orderId,
             value: Math.round(fee * 100)
           },
           name: "billing",
@@ -3974,7 +4018,7 @@ var shopify_default2 = {
       // against the ones the app now needs, and queues a webhook
       // reconciliation.
       health: async ({ connection: connection2, workflow }, { adminToken, logger: logger2, read, reconcileScopes, resolveSettings, rotateToken, shopify } = {}) => {
-        var _a, _b;
+        var _a, _b, _c;
         const request2 = {
           connectionId: workflow.connection,
           organizationId: workflow.organization,
@@ -3996,7 +4040,7 @@ var shopify_default2 = {
           const writes = [];
           let source = connection2.source || null;
           let sourceRepaired = false;
-          let metered = (source == null ? void 0 : source.metered) ?? null;
+          let metered;
           let shopCurrency = null;
           let billingProbeFailed = false;
           try {
@@ -4015,26 +4059,66 @@ var shopify_default2 = {
               domain: connection2.shop
             });
             if (subscriptions.length && subscriptions.every((subscription) => typeof subscription.metered === "boolean")) {
-              metered = subscriptions.some((subscription) => subscription.metered);
+              metered = ((_a = subscriptions.find((subscription) => subscription.usageLineItemId)) == null ? void 0 : _a.usageLineItemId) || null;
             }
           } catch (probeError) {
             billingProbeFailed = true;
-            (_a = logger2 == null ? void 0 : logger2.warn) == null ? void 0 : _a.call(logger2, "shopify.health.billing.probe.failed", {
+            (_b = logger2 == null ? void 0 : logger2.warn) == null ? void 0 : _b.call(logger2, "shopify.health.billing.probe.failed", {
               connectionId: connection2.id,
               message: probeError == null ? void 0 : probeError.message,
               shop: connection2.shop
             });
           }
-          if (sourceRepaired || metered !== null && metered !== (((_b = connection2.source) == null ? void 0 : _b.metered) ?? null)) {
+          if (sourceRepaired || metered !== void 0 && metered !== (((_c = connection2.source) == null ? void 0 : _c.metered) ?? void 0)) {
+            writes.push({
+              collection: "connection",
+              data: {
+                $set: sourceRepaired ? { source: { ...source, ...metered !== void 0 && { metered } } } : { "source.metered": metered }
+              },
+              operation: "update",
+              query: { id: connection2.id }
+            });
+          }
+          const hasBillingIssue = (connection2.errors || []).some((entry) => entry.source === BILLING_ERROR_SOURCE);
+          if (metered === null && !hasBillingIssue) {
             writes.push({
               collection: "connection",
               data: {
-                $set: sourceRepaired ? { source: { ...source, ...metered !== null && { metered } } } : { "source.metered": metered }
+                $push: {
+                  errors: {
+                    message: BILLING_ERROR_MESSAGE,
+                    source: BILLING_ERROR_SOURCE
+                  }
+                }
               },
               operation: "update",
               query: { id: connection2.id }
             });
           }
+          if (typeof metered === "string" && hasBillingIssue) {
+            writes.push({
+              collection: "connection",
+              data: {
+                $pull: {
+                  errors: { source: BILLING_ERROR_SOURCE }
+                }
+              },
+              operation: "update",
+              query: { id: connection2.id }
+            });
+            writes.push({
+              collection: "connection",
+              data: {
+                $set: { status: "active" }
+              },
+              operation: "update",
+              query: {
+                id: connection2.id,
+                status: "error",
+                "errors.0": { $exists: false }
+              }
+            });
+          }
           return {
             writes,
             enqueues: [{
@@ -4049,11 +4133,12 @@ var shopify_default2 = {
               options: { jobId: "connection.update.register." + workflow.connection + "." + randomUUID() },
               queue: "connection"
             }],
-            message: ((scopesMissing == null ? void 0 : scopesMissing.length) ? "Health check: ping ok, webhooks reconciled \u2014 connection errored, granted scopes are missing: " + scopesMissing.join(", ") + "." : refreshTokenRotated ? "Health check passed \u2014 refresh token rotated, ping ok, webhooks reconciled." : "Health check passed \u2014 ping ok, webhooks reconciled.") + (sourceRepaired ? " Billing source repaired from the live shop." : "") + (metered === false ? " No usage line on the store's approved plan \u2014 order billing needs the merchant to approve the updated plan." : ""),
+            message: ((scopesMissing == null ? void 0 : scopesMissing.length) ? "Health check: ping ok, webhooks reconciled \u2014 connection errored, granted scopes are missing: " + scopesMissing.join(", ") + "." : refreshTokenRotated ? "Health check passed \u2014 refresh token rotated, ping ok, webhooks reconciled." : "Health check passed \u2014 ping ok, webhooks reconciled.") + (sourceRepaired ? " Billing source repaired from the live shop." : "") + (metered === null ? " No usage line on the store's approved plan \u2014 order billing needs the merchant to approve the updated plan." : ""),
             request: request2,
             response: {
               billingProbeFailed,
-              metered,
+              metered: metered ?? null,
+              meterProbed: metered !== void 0,
               pingedAt: /* @__PURE__ */ new Date(),
               refreshTokenExpiresAt: refreshTokenExpiresAt || null,
               refreshTokenRotated,
@@ -4198,7 +4283,15 @@ var shopify_default2 = {
       { input: "text", key: "apiKey", credential: "SHOPIFY_API_KEY", label: "API key", required: true },
       { input: "password", key: "apiSecret", credential: "SHOPIFY_API_SECRET", label: "API secret", redact: true, required: true },
       { input: "text", key: "appHandle", credential: "SHOPIFY_APP_HANDLE", label: "App handle", required: true },
-      { input: "text", key: "listingUrl", credential: "SHOPIFY_APP_LISTING_URL", label: "App listing URL", required: true }
+      { input: "text", key: "listingUrl", credential: "SHOPIFY_APP_LISTING_URL", label: "App listing URL", required: true },
+      // The usage meter's event handle, when the plan config's meter ever
+      // changes: stored value overrides the built-in default
+      // (events.order.handle) at the mint point, and `format : 'slug'`
+      // normalizes it on save — a handle can carry no spaces or capitals,
+      // and classification against it is case-sensitive. Optional: empty
+      // means the default, and the sender still refuses any handle that
+      // disagrees with the transaction it minted.
+      { format: "slug", input: "text", key: "orderEventHandle", label: "Order event handle", required: false, setting: true }
     ]
   },
   // A pre-launch integration: it only surfaces once the App Store listing
@@ -4340,20 +4433,24 @@ var shopify_default2 = {
       ...(data2 == null ? void 0 : data2.status) === "pending" ? [
         {
           action: "billing",
-          message: "Approve the Drawbridge plan to activate this connection. You'll confirm the pricing on Shopify, then everything else happens here.",
-          title: "Approve your plan"
+          message: "Approve the Drawbridge plan to activate this connection. You'll be asked to select a plan on Shopify, then everything else happens here.",
+          title: "Approve your plan",
+          type: "warning"
         }
       ] : [],
       // The store's ACTIVE approval carries no usage component — stamped by
-      // the daily health check and the approval webhook (`source.metered`).
-      // Approved pricing is never retroactive, so the fix is a fresh approval.
-      // Gated on an EXPLICIT false — a connection the probe hasn't reached
-      // (or couldn't read) shows nothing rather than nagging on silence.
-      ...(data2 == null ? void 0 : data2.status) === "active" && ((_a = data2 == null ? void 0 : data2.source) == null ? void 0 : _a.metered) === false ? [
+      // the daily health check and the approval webhook (`source.metered`:
+      // the usage line's id when present, null when probed-and-absent).
+      // Approved pricing is never retroactive, so the fix is a fresh
+      // approval. Gated on an EXPLICIT null — a connection the probe hasn't
+      // reached (or couldn't read) has no key and shows nothing rather than
+      // nagging on silence.
+      ...(data2 == null ? void 0 : data2.status) === "active" && ((_a = data2 == null ? void 0 : data2.source) == null ? void 0 : _a.metered) === null ? [
         {
           action: "billing",
-          message: "Order billing isn't set up for this store, so campaign-attributed orders aren't being charged. Approve the updated plan to fix it \u2014 one click here, one confirmation on Shopify.",
-          title: "Fix order billing"
+          message: "Order billing isn't set up for this store, so campaign-attributed orders aren't being charged. You'll need to reselect your plan on Shopify and approve it to fix this.",
+          title: "Fix order billing",
+          type: "error"
         }
       ] : []
     ];
@@ -4362,7 +4459,7 @@ var shopify_default2 = {
 };
 
 // lib/connections/providers/webhook.js
-import crypto from "crypto";
+import crypto3 from "crypto";
 
 // lib/safe-http.js
 import dns2 from "dns";
@@ -4597,7 +4694,7 @@ var webhook_default = {
         request2.body = body;
         const outgoing = { ...headers };
         if (settings == null ? void 0 : settings.secret) {
-          outgoing["X-Drawbridge-Signature"] = "sha256=" + crypto.createHmac("sha256", settings.secret).update(JSON.stringify(body)).digest("hex");
+          outgoing["X-Drawbridge-Signature"] = "sha256=" + crypto3.createHmac("sha256", settings.secret).update(JSON.stringify(body)).digest("hex");
         }
         const response = await send2({ body, headers: outgoing, method, url });
         return { message: "Webhook POSTed to " + url + ".", request: request2, response: response || { delivered: true } };
@@ -4883,45 +4980,6 @@ var publicConnectionKeys = Object.freeze([
   "warnings"
 ]);
 
-// lib/encrypt.js
-import crypto3 from "crypto";
-
-// lib/token.js
-import crypto2 from "crypto";
-var generate = (bytes = 32, encoding = "base64url") => {
-  const buf = crypto2.randomBytes(bytes);
-  return encoding ? buf.toString(encoding) : buf;
-};
-
-// lib/encrypt.js
-var ALGORITHM = "aes-256-gcm";
-var getKey = () => Buffer.from(process.env.ENCRYPT_CONNECTION_SECRET, "hex");
-var encrypt = (value) => {
-  const iv = generate(12, null);
-  const cipher = crypto3.createCipheriv(ALGORITHM, getKey(), iv);
-  const data2 = Buffer.concat([
-    cipher.update(JSON.stringify(value), "utf8"),
-    cipher.final()
-  ]);
-  const tag = cipher.getAuthTag();
-  return [iv, tag, data2].map((b) => b.toString("hex")).join(":");
-};
-var decrypt = (value) => {
-  if (typeof value !== "string") return value;
-  const [ivHex, tagHex, dataHex] = value.split(":");
-  const decipher = crypto3.createDecipheriv(
-    ALGORITHM,
-    getKey(),
-    Buffer.from(ivHex, "hex")
-  );
-  decipher.setAuthTag(Buffer.from(tagHex, "hex"));
-  const result = Buffer.concat([
-    decipher.update(Buffer.from(dataHex, "hex")),
-    decipher.final()
-  ]);
-  return JSON.parse(result.toString("utf8"));
-};
-
 // lib/providers.js
 var providerFields = (slug2) => {
   var _a;
@@ -4961,9 +5019,10 @@ var saveProviderSettings = async ({ authenticated, clear, controller, settings,
   });
   const stored = (existing == null ? void 0 : existing.settings) ? decrypt(existing.settings) : {};
   const pasted = (value) => typeof value === "string" ? value.trim().replace(/^['"]+|['"]+$/g, "") : value;
+  const normalized = (field2, value) => field2.format === "slug" && typeof value === "string" && value ? slugify(value) : value;
   const merged = mergeSettings({
     existing: stored,
-    incoming: Object.fromEntries(fields2.map((field2) => [field2.key, pasted(settings == null ? void 0 : settings[field2.key])]))
+    incoming: Object.fromEntries(fields2.map((field2) => [field2.key, normalized(field2, pasted(settings == null ? void 0 : settings[field2.key]))]))
   });
   for (const key of Array.isArray(clear) ? clear : []) {
     if (fields2.some((field2) => field2.key === key)) delete merged[key];

package/package.json

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