@progus/connector 0.6.3 → 0.6.5

package/dist/index.cjs

@@ -368,6 +368,42 @@ var ACTIVE_SUBSCRIPTIONS_QUERY = `
                   amount
                 }
               }
+              ... on AppUsagePricing {
+                cappedAmount {
+                  amount
+                }
+                terms
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+`;
+var SUBSCRIPTION_DETAILS_QUERY = `
+  query AppSubscriptionDetails($id: ID!) {
+    node(id: $id) {
+      ... on AppSubscription {
+        id
+        name
+        status
+        lineItems {
+          plan {
+            pricingDetails {
+              __typename
+              ... on AppRecurringPricing {
+                interval
+                price {
+                  amount
+                }
+              }
+              ... on AppUsagePricing {
+                cappedAmount {
+                  amount
+                }
+                terms
+              }
             }
           }
         }
@@ -396,6 +432,13 @@ function parsePrice(rawPrice) {
   }
   return null;
 }
+function extractPricing(subscription) {
+  const pricingDetails = subscription?.lineItems?.[0]?.plan?.pricingDetails;
+  const rawPrice = pricingDetails?.price?.amount ?? pricingDetails?.cappedAmount?.amount;
+  const subscriptionPrice = parsePrice(rawPrice);
+  const subscriptionPeriod = normalizeInterval(pricingDetails?.interval, subscription?.name);
+  return { subscriptionPrice, subscriptionPeriod };
+}
 async function fetchActiveSubscriptionEventData(admin, logger = console) {
   const response = await admin.graphql(ACTIVE_SUBSCRIPTIONS_QUERY);
   const result = await response.json();
@@ -406,9 +449,33 @@ async function fetchActiveSubscriptionEventData(admin, logger = console) {
   const active = subscriptions.find((sub) => String(sub.status ?? "").toUpperCase() === "ACTIVE") ?? subscriptions[0];
   const subscriptionId = parseSubscriptionId(active?.id);
   if (!subscriptionId) return null;
-  const pricingDetails = active?.lineItems?.[0]?.plan?.pricingDetails;
-  const subscriptionPrice = parsePrice(pricingDetails?.price?.amount);
-  const subscriptionPeriod = normalizeInterval(pricingDetails?.interval, active?.name);
+  let { subscriptionPrice, subscriptionPeriod } = extractPricing(active);
+  if (!subscriptionPeriod || subscriptionPrice === null) {
+    try {
+      const detailsResponse = await admin.graphql(SUBSCRIPTION_DETAILS_QUERY, {
+        variables: { id: active?.id }
+      });
+      const detailsJson = await detailsResponse.json();
+      if (detailsJson.errors?.length) {
+        logger.error?.("Partner subscription details query errors", { errors: detailsJson.errors });
+      }
+      const details = detailsJson.data?.node;
+      ({ subscriptionPrice, subscriptionPeriod } = extractPricing(details));
+      if (!subscriptionPeriod || subscriptionPrice === null) return null;
+      return {
+        subscriptionStatus: details?.status ?? active?.status ?? "ACTIVE",
+        subscriptionName: details?.name ?? active?.name,
+        subscriptionId,
+        subscriptionPrice,
+        subscriptionPeriod
+      };
+    } catch (error) {
+      logger.error?.("Partner subscription details query failed", {
+        error: error instanceof Error ? error.message : String(error)
+      });
+      return null;
+    }
+  }
   if (!subscriptionPeriod || subscriptionPrice === null) return null;
   return {
     subscriptionStatus: active?.status ?? "ACTIVE",

package/dist/index.js

@@ -226,6 +226,42 @@ var ACTIVE_SUBSCRIPTIONS_QUERY = `
                   amount
                 }
               }
+              ... on AppUsagePricing {
+                cappedAmount {
+                  amount
+                }
+                terms
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+`;
+var SUBSCRIPTION_DETAILS_QUERY = `
+  query AppSubscriptionDetails($id: ID!) {
+    node(id: $id) {
+      ... on AppSubscription {
+        id
+        name
+        status
+        lineItems {
+          plan {
+            pricingDetails {
+              __typename
+              ... on AppRecurringPricing {
+                interval
+                price {
+                  amount
+                }
+              }
+              ... on AppUsagePricing {
+                cappedAmount {
+                  amount
+                }
+                terms
+              }
             }
           }
         }
@@ -254,6 +290,13 @@ function parsePrice(rawPrice) {
   }
   return null;
 }
+function extractPricing(subscription) {
+  const pricingDetails = subscription?.lineItems?.[0]?.plan?.pricingDetails;
+  const rawPrice = pricingDetails?.price?.amount ?? pricingDetails?.cappedAmount?.amount;
+  const subscriptionPrice = parsePrice(rawPrice);
+  const subscriptionPeriod = normalizeInterval(pricingDetails?.interval, subscription?.name);
+  return { subscriptionPrice, subscriptionPeriod };
+}
 async function fetchActiveSubscriptionEventData(admin, logger = console) {
   const response = await admin.graphql(ACTIVE_SUBSCRIPTIONS_QUERY);
   const result = await response.json();
@@ -264,9 +307,33 @@ async function fetchActiveSubscriptionEventData(admin, logger = console) {
   const active = subscriptions.find((sub) => String(sub.status ?? "").toUpperCase() === "ACTIVE") ?? subscriptions[0];
   const subscriptionId = parseSubscriptionId(active?.id);
   if (!subscriptionId) return null;
-  const pricingDetails = active?.lineItems?.[0]?.plan?.pricingDetails;
-  const subscriptionPrice = parsePrice(pricingDetails?.price?.amount);
-  const subscriptionPeriod = normalizeInterval(pricingDetails?.interval, active?.name);
+  let { subscriptionPrice, subscriptionPeriod } = extractPricing(active);
+  if (!subscriptionPeriod || subscriptionPrice === null) {
+    try {
+      const detailsResponse = await admin.graphql(SUBSCRIPTION_DETAILS_QUERY, {
+        variables: { id: active?.id }
+      });
+      const detailsJson = await detailsResponse.json();
+      if (detailsJson.errors?.length) {
+        logger.error?.("Partner subscription details query errors", { errors: detailsJson.errors });
+      }
+      const details = detailsJson.data?.node;
+      ({ subscriptionPrice, subscriptionPeriod } = extractPricing(details));
+      if (!subscriptionPeriod || subscriptionPrice === null) return null;
+      return {
+        subscriptionStatus: details?.status ?? active?.status ?? "ACTIVE",
+        subscriptionName: details?.name ?? active?.name,
+        subscriptionId,
+        subscriptionPrice,
+        subscriptionPeriod
+      };
+    } catch (error) {
+      logger.error?.("Partner subscription details query failed", {
+        error: error instanceof Error ? error.message : String(error)
+      });
+      return null;
+    }
+  }
   if (!subscriptionPeriod || subscriptionPrice === null) return null;
   return {
     subscriptionStatus: active?.status ?? "ACTIVE",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@progus/connector",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "description": "Progus partner/affiliate connector helpers",
   "license": "MIT",
   "type": "module",