@progus/connector 0.6.5 → 0.6.8

package/dist/{crossSell-Bs_6xA6f.d.cts → crossSell-BZZ9FX7S.d.cts}

@@ -44,6 +44,9 @@ type AssignPartnerIdInput = {
     shopDomain: string;
     partnerId: string;
 };
+type AssignPartnerIdWithSubscriptionInput = AssignPartnerIdInput & {
+    admin: ShopifyAdminGraphQLClient;
+};
 type SubscriptionEventData = {
     subscriptionStatus?: string;
     subscriptionName?: string;
@@ -82,4 +85,4 @@ declare function getCrossSellOffers(options?: CrossSellOptions): AppsCatalogEntr
 declare function fetchAppsCatalog(options?: CrossSellFetchOptions): Promise<AppsCatalogEntry[]>;
 declare function getCrossSellOffersFromApi(options?: CrossSellFetchOptions): Promise<AppsCatalogEntry[]>;
 
-export { type AssignPartnerIdInput as A, type ConnectorConfig as C, type Logger as L, type SubscriptionEventData as S, type TrackEventParams as T, type TrackResult as a, type CheckPartnerIdResult as b, type ShopifyAdminGraphQLClient as c, getCrossSellOffersFromApi as d, type AppsCatalogEntry as e, fetchAppsCatalog as f, getCrossSellOffers as g, type CrossSellFetchOptions as h, type CrossSellOptions as i, type TrackEventName as j };
+export { type AssignPartnerIdInput as A, type ConnectorConfig as C, type Logger as L, type SubscriptionEventData as S, type TrackEventParams as T, type TrackResult as a, type AssignPartnerIdWithSubscriptionInput as b, type CheckPartnerIdResult as c, type ShopifyAdminGraphQLClient as d, getCrossSellOffersFromApi as e, fetchAppsCatalog as f, getCrossSellOffers as g, type AppsCatalogEntry as h, type CrossSellFetchOptions as i, type CrossSellOptions as j, type TrackEventName as k };

package/dist/{crossSell-Bs_6xA6f.d.ts → crossSell-BZZ9FX7S.d.ts}

@@ -44,6 +44,9 @@ type AssignPartnerIdInput = {
     shopDomain: string;
     partnerId: string;
 };
+type AssignPartnerIdWithSubscriptionInput = AssignPartnerIdInput & {
+    admin: ShopifyAdminGraphQLClient;
+};
 type SubscriptionEventData = {
     subscriptionStatus?: string;
     subscriptionName?: string;
@@ -82,4 +85,4 @@ declare function getCrossSellOffers(options?: CrossSellOptions): AppsCatalogEntr
 declare function fetchAppsCatalog(options?: CrossSellFetchOptions): Promise<AppsCatalogEntry[]>;
 declare function getCrossSellOffersFromApi(options?: CrossSellFetchOptions): Promise<AppsCatalogEntry[]>;
 
-export { type AssignPartnerIdInput as A, type ConnectorConfig as C, type Logger as L, type SubscriptionEventData as S, type TrackEventParams as T, type TrackResult as a, type CheckPartnerIdResult as b, type ShopifyAdminGraphQLClient as c, getCrossSellOffersFromApi as d, type AppsCatalogEntry as e, fetchAppsCatalog as f, getCrossSellOffers as g, type CrossSellFetchOptions as h, type CrossSellOptions as i, type TrackEventName as j };
+export { type AssignPartnerIdInput as A, type ConnectorConfig as C, type Logger as L, type SubscriptionEventData as S, type TrackEventParams as T, type TrackResult as a, type AssignPartnerIdWithSubscriptionInput as b, type CheckPartnerIdResult as c, type ShopifyAdminGraphQLClient as d, getCrossSellOffersFromApi as e, fetchAppsCatalog as f, getCrossSellOffers as g, type AppsCatalogEntry as h, type CrossSellFetchOptions as i, type CrossSellOptions as j, type TrackEventName as k };

package/dist/crossSell.d.cts

@@ -1 +1 @@
-export { e as AppsCatalogEntry, h as CrossSellFetchOptions, i as CrossSellOptions, f as fetchAppsCatalog, g as getCrossSellOffers, d as getCrossSellOffersFromApi } from './crossSell-Bs_6xA6f.cjs';
+export { h as AppsCatalogEntry, i as CrossSellFetchOptions, j as CrossSellOptions, f as fetchAppsCatalog, g as getCrossSellOffers, e as getCrossSellOffersFromApi } from './crossSell-BZZ9FX7S.cjs';

package/dist/crossSell.d.ts

@@ -1 +1 @@
-export { e as AppsCatalogEntry, h as CrossSellFetchOptions, i as CrossSellOptions, f as fetchAppsCatalog, g as getCrossSellOffers, d as getCrossSellOffersFromApi } from './crossSell-Bs_6xA6f.js';
+export { h as AppsCatalogEntry, i as CrossSellFetchOptions, j as CrossSellOptions, f as fetchAppsCatalog, g as getCrossSellOffers, e as getCrossSellOffersFromApi } from './crossSell-BZZ9FX7S.js';

package/dist/index.cjs

@@ -30,6 +30,142 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
+// src/subscription.ts
+var ACTIVE_SUBSCRIPTIONS_QUERY = `
+  query {
+    currentAppInstallation {
+      activeSubscriptions {
+        id
+        name
+        status
+        lineItems {
+          plan {
+            pricingDetails {
+              __typename
+              ... on AppRecurringPricing {
+                interval
+                price {
+                  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
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+`;
+function normalizeInterval(intervalRaw, nameHint) {
+  const interval = intervalRaw ? String(intervalRaw).toUpperCase() : "";
+  if (interval === "ANNUAL" || interval === "EVERY_30_DAYS") return interval;
+  if (interval === "MONTHLY" || interval === "EVERY_30DAYS") return "EVERY_30_DAYS";
+  const name = (nameHint ?? "").toLowerCase();
+  if (name.includes("annual") || name.includes("year")) return "ANNUAL";
+  if (name) return "EVERY_30_DAYS";
+  return "";
+}
+function parseSubscriptionId(rawId) {
+  if (!rawId) return null;
+  return rawId.match(/\d+$/)?.[0] ?? rawId.split("/").pop() ?? rawId;
+}
+function parsePrice(rawPrice) {
+  if (typeof rawPrice === "number") return rawPrice;
+  if (typeof rawPrice === "string") {
+    const parsed = Number(rawPrice);
+    return Number.isFinite(parsed) ? parsed : null;
+  }
+  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();
+  if (result.errors?.length) {
+    logger.error?.("Partner subscription query errors", { errors: result.errors });
+  }
+  const subscriptions = result.data?.currentAppInstallation?.activeSubscriptions ?? [];
+  const active = subscriptions.find((sub) => String(sub.status ?? "").toUpperCase() === "ACTIVE") ?? subscriptions[0];
+  const subscriptionId = parseSubscriptionId(active?.id);
+  if (!subscriptionId) return null;
+  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",
+    subscriptionName: active?.name,
+    subscriptionId,
+    subscriptionPrice,
+    subscriptionPeriod
+  };
+}
+
 // src/signing.ts
 var import_crypto = require("crypto");
 function signPayload(body, secret) {
@@ -76,6 +212,7 @@ function createProgusConnector(config) {
       trackSubscriptionUpdated: fail,
       trackSubscriptionCancelled: fail,
       assignPartnerId: fail,
+      assignPartnerIdWithSubscription: fail,
       checkPartnerId: async () => ({ success: false, message, status: 500 })
     };
   }
@@ -177,6 +314,25 @@ function createProgusConnector(config) {
     const result = await trackInstall({ shopDomain: payload.shopDomain, partnerId: normalized });
     return { ...result, partnerId: normalized };
   }
+  async function assignPartnerIdWithSubscription(payload) {
+    const { admin, ...rest } = payload;
+    const result = await assignPartnerId(rest);
+    if (!result.success) return result;
+    try {
+      const subscriptionPayload = await fetchActiveSubscriptionEventData(admin, logger);
+      if (subscriptionPayload) {
+        await trackSubscription({
+          shopDomain: rest.shopDomain,
+          data: subscriptionPayload
+        });
+      }
+    } catch (error) {
+      logger?.error?.("Partner subscription sync failed", {
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+    return result;
+  }
   async function checkPartnerId(payload) {
     if (!payload.shopDomain) {
       return { success: false, message: "Missing shop domain" };
@@ -247,6 +403,7 @@ function createProgusConnector(config) {
     trackSubscriptionUpdated: trackSubscription,
     trackSubscriptionCancelled: trackSubscription,
     assignPartnerId,
+    assignPartnerIdWithSubscription,
     checkPartnerId
   };
 }
@@ -349,142 +506,6 @@ async function getCrossSellOffersFromApi(options = {}) {
   const appsCatalog = options.appsCatalog ?? await fetchAppsCatalog(options);
   return getCrossSellOffers({ ...options, appsCatalog });
 }
-
-// src/subscription.ts
-var ACTIVE_SUBSCRIPTIONS_QUERY = `
-  query {
-    currentAppInstallation {
-      activeSubscriptions {
-        id
-        name
-        status
-        lineItems {
-          plan {
-            pricingDetails {
-              __typename
-              ... on AppRecurringPricing {
-                interval
-                price {
-                  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
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-`;
-function normalizeInterval(intervalRaw, nameHint) {
-  const interval = intervalRaw ? String(intervalRaw).toUpperCase() : "";
-  if (interval === "ANNUAL" || interval === "EVERY_30_DAYS") return interval;
-  if (interval === "MONTHLY" || interval === "EVERY_30DAYS") return "EVERY_30_DAYS";
-  const name = (nameHint ?? "").toLowerCase();
-  if (name.includes("annual") || name.includes("year")) return "ANNUAL";
-  if (name) return "EVERY_30_DAYS";
-  return "";
-}
-function parseSubscriptionId(rawId) {
-  if (!rawId) return null;
-  return rawId.match(/\d+$/)?.[0] ?? rawId.split("/").pop() ?? rawId;
-}
-function parsePrice(rawPrice) {
-  if (typeof rawPrice === "number") return rawPrice;
-  if (typeof rawPrice === "string") {
-    const parsed = Number(rawPrice);
-    return Number.isFinite(parsed) ? parsed : null;
-  }
-  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();
-  if (result.errors?.length) {
-    logger.error?.("Partner subscription query errors", { errors: result.errors });
-  }
-  const subscriptions = result.data?.currentAppInstallation?.activeSubscriptions ?? [];
-  const active = subscriptions.find((sub) => String(sub.status ?? "").toUpperCase() === "ACTIVE") ?? subscriptions[0];
-  const subscriptionId = parseSubscriptionId(active?.id);
-  if (!subscriptionId) return null;
-  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",
-    subscriptionName: active?.name,
-    subscriptionId,
-    subscriptionPrice,
-    subscriptionPeriod
-  };
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createProgusConnector,

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { C as ConnectorConfig, T as TrackEventParams, a as TrackResult, S as SubscriptionEventData, A as AssignPartnerIdInput, b as CheckPartnerIdResult, c as ShopifyAdminGraphQLClient } from './crossSell-Bs_6xA6f.cjs';
-export { e as AppsCatalogEntry, h as CrossSellFetchOptions, i as CrossSellOptions, L as Logger, j as TrackEventName, f as fetchAppsCatalog, g as getCrossSellOffers, d as getCrossSellOffersFromApi } from './crossSell-Bs_6xA6f.cjs';
+import { C as ConnectorConfig, T as TrackEventParams, a as TrackResult, S as SubscriptionEventData, A as AssignPartnerIdInput, b as AssignPartnerIdWithSubscriptionInput, c as CheckPartnerIdResult, d as ShopifyAdminGraphQLClient } from './crossSell-BZZ9FX7S.cjs';
+export { h as AppsCatalogEntry, i as CrossSellFetchOptions, j as CrossSellOptions, L as Logger, k as TrackEventName, f as fetchAppsCatalog, g as getCrossSellOffers, e as getCrossSellOffersFromApi } from './crossSell-BZZ9FX7S.cjs';
 
 type Connector = {
     track: (eventName: TrackEventParams["eventName"], payload: Omit<TrackEventParams, "eventName">) => Promise<TrackResult>;
@@ -25,6 +25,9 @@ type Connector = {
     assignPartnerId: (payload: AssignPartnerIdInput) => Promise<TrackResult & {
         partnerId?: string;
     }>;
+    assignPartnerIdWithSubscription: (payload: AssignPartnerIdWithSubscriptionInput) => Promise<TrackResult & {
+        partnerId?: string;
+    }>;
     checkPartnerId: (payload: {
         shopDomain: string;
     }) => Promise<CheckPartnerIdResult>;
@@ -39,4 +42,4 @@ declare function signPayload(body: string, secret: string): string;
 
 declare function normalizePartnerId(value?: string | null): string | null;
 
-export { AssignPartnerIdInput, CheckPartnerIdResult, ConnectorConfig, ShopifyAdminGraphQLClient, SubscriptionEventData, TrackEventParams, TrackResult, createProgusConnector, fetchActiveSubscriptionEventData, normalizePartnerId, signPayload };
+export { AssignPartnerIdInput, AssignPartnerIdWithSubscriptionInput, CheckPartnerIdResult, ConnectorConfig, ShopifyAdminGraphQLClient, SubscriptionEventData, TrackEventParams, TrackResult, createProgusConnector, fetchActiveSubscriptionEventData, normalizePartnerId, signPayload };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { C as ConnectorConfig, T as TrackEventParams, a as TrackResult, S as SubscriptionEventData, A as AssignPartnerIdInput, b as CheckPartnerIdResult, c as ShopifyAdminGraphQLClient } from './crossSell-Bs_6xA6f.js';
-export { e as AppsCatalogEntry, h as CrossSellFetchOptions, i as CrossSellOptions, L as Logger, j as TrackEventName, f as fetchAppsCatalog, g as getCrossSellOffers, d as getCrossSellOffersFromApi } from './crossSell-Bs_6xA6f.js';
+import { C as ConnectorConfig, T as TrackEventParams, a as TrackResult, S as SubscriptionEventData, A as AssignPartnerIdInput, b as AssignPartnerIdWithSubscriptionInput, c as CheckPartnerIdResult, d as ShopifyAdminGraphQLClient } from './crossSell-BZZ9FX7S.js';
+export { h as AppsCatalogEntry, i as CrossSellFetchOptions, j as CrossSellOptions, L as Logger, k as TrackEventName, f as fetchAppsCatalog, g as getCrossSellOffers, e as getCrossSellOffersFromApi } from './crossSell-BZZ9FX7S.js';
 
 type Connector = {
     track: (eventName: TrackEventParams["eventName"], payload: Omit<TrackEventParams, "eventName">) => Promise<TrackResult>;
@@ -25,6 +25,9 @@ type Connector = {
     assignPartnerId: (payload: AssignPartnerIdInput) => Promise<TrackResult & {
         partnerId?: string;
     }>;
+    assignPartnerIdWithSubscription: (payload: AssignPartnerIdWithSubscriptionInput) => Promise<TrackResult & {
+        partnerId?: string;
+    }>;
     checkPartnerId: (payload: {
         shopDomain: string;
     }) => Promise<CheckPartnerIdResult>;
@@ -39,4 +42,4 @@ declare function signPayload(body: string, secret: string): string;
 
 declare function normalizePartnerId(value?: string | null): string | null;
 
-export { AssignPartnerIdInput, CheckPartnerIdResult, ConnectorConfig, ShopifyAdminGraphQLClient, SubscriptionEventData, TrackEventParams, TrackResult, createProgusConnector, fetchActiveSubscriptionEventData, normalizePartnerId, signPayload };
+export { AssignPartnerIdInput, AssignPartnerIdWithSubscriptionInput, CheckPartnerIdResult, ConnectorConfig, ShopifyAdminGraphQLClient, SubscriptionEventData, TrackEventParams, TrackResult, createProgusConnector, fetchActiveSubscriptionEventData, normalizePartnerId, signPayload };

package/dist/index.js

@@ -8,6 +8,142 @@ import {
   stripTrailingSlash
 } from "./chunk-WZ5FAA44.js";
 
+// src/subscription.ts
+var ACTIVE_SUBSCRIPTIONS_QUERY = `
+  query {
+    currentAppInstallation {
+      activeSubscriptions {
+        id
+        name
+        status
+        lineItems {
+          plan {
+            pricingDetails {
+              __typename
+              ... on AppRecurringPricing {
+                interval
+                price {
+                  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
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+`;
+function normalizeInterval(intervalRaw, nameHint) {
+  const interval = intervalRaw ? String(intervalRaw).toUpperCase() : "";
+  if (interval === "ANNUAL" || interval === "EVERY_30_DAYS") return interval;
+  if (interval === "MONTHLY" || interval === "EVERY_30DAYS") return "EVERY_30_DAYS";
+  const name = (nameHint ?? "").toLowerCase();
+  if (name.includes("annual") || name.includes("year")) return "ANNUAL";
+  if (name) return "EVERY_30_DAYS";
+  return "";
+}
+function parseSubscriptionId(rawId) {
+  if (!rawId) return null;
+  return rawId.match(/\d+$/)?.[0] ?? rawId.split("/").pop() ?? rawId;
+}
+function parsePrice(rawPrice) {
+  if (typeof rawPrice === "number") return rawPrice;
+  if (typeof rawPrice === "string") {
+    const parsed = Number(rawPrice);
+    return Number.isFinite(parsed) ? parsed : null;
+  }
+  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();
+  if (result.errors?.length) {
+    logger.error?.("Partner subscription query errors", { errors: result.errors });
+  }
+  const subscriptions = result.data?.currentAppInstallation?.activeSubscriptions ?? [];
+  const active = subscriptions.find((sub) => String(sub.status ?? "").toUpperCase() === "ACTIVE") ?? subscriptions[0];
+  const subscriptionId = parseSubscriptionId(active?.id);
+  if (!subscriptionId) return null;
+  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",
+    subscriptionName: active?.name,
+    subscriptionId,
+    subscriptionPrice,
+    subscriptionPeriod
+  };
+}
+
 // src/signing.ts
 import { createHmac } from "crypto";
 function signPayload(body, secret) {
@@ -33,6 +169,7 @@ function createProgusConnector(config) {
       trackSubscriptionUpdated: fail,
       trackSubscriptionCancelled: fail,
       assignPartnerId: fail,
+      assignPartnerIdWithSubscription: fail,
       checkPartnerId: async () => ({ success: false, message, status: 500 })
     };
   }
@@ -134,6 +271,25 @@ function createProgusConnector(config) {
     const result = await trackInstall({ shopDomain: payload.shopDomain, partnerId: normalized });
     return { ...result, partnerId: normalized };
   }
+  async function assignPartnerIdWithSubscription(payload) {
+    const { admin, ...rest } = payload;
+    const result = await assignPartnerId(rest);
+    if (!result.success) return result;
+    try {
+      const subscriptionPayload = await fetchActiveSubscriptionEventData(admin, logger);
+      if (subscriptionPayload) {
+        await trackSubscription({
+          shopDomain: rest.shopDomain,
+          data: subscriptionPayload
+        });
+      }
+    } catch (error) {
+      logger?.error?.("Partner subscription sync failed", {
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+    return result;
+  }
   async function checkPartnerId(payload) {
     if (!payload.shopDomain) {
       return { success: false, message: "Missing shop domain" };
@@ -204,145 +360,10 @@ function createProgusConnector(config) {
     trackSubscriptionUpdated: trackSubscription,
     trackSubscriptionCancelled: trackSubscription,
     assignPartnerId,
+    assignPartnerIdWithSubscription,
     checkPartnerId
   };
 }
-
-// src/subscription.ts
-var ACTIVE_SUBSCRIPTIONS_QUERY = `
-  query {
-    currentAppInstallation {
-      activeSubscriptions {
-        id
-        name
-        status
-        lineItems {
-          plan {
-            pricingDetails {
-              __typename
-              ... on AppRecurringPricing {
-                interval
-                price {
-                  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
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-`;
-function normalizeInterval(intervalRaw, nameHint) {
-  const interval = intervalRaw ? String(intervalRaw).toUpperCase() : "";
-  if (interval === "ANNUAL" || interval === "EVERY_30_DAYS") return interval;
-  if (interval === "MONTHLY" || interval === "EVERY_30DAYS") return "EVERY_30_DAYS";
-  const name = (nameHint ?? "").toLowerCase();
-  if (name.includes("annual") || name.includes("year")) return "ANNUAL";
-  if (name) return "EVERY_30_DAYS";
-  return "";
-}
-function parseSubscriptionId(rawId) {
-  if (!rawId) return null;
-  return rawId.match(/\d+$/)?.[0] ?? rawId.split("/").pop() ?? rawId;
-}
-function parsePrice(rawPrice) {
-  if (typeof rawPrice === "number") return rawPrice;
-  if (typeof rawPrice === "string") {
-    const parsed = Number(rawPrice);
-    return Number.isFinite(parsed) ? parsed : null;
-  }
-  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();
-  if (result.errors?.length) {
-    logger.error?.("Partner subscription query errors", { errors: result.errors });
-  }
-  const subscriptions = result.data?.currentAppInstallation?.activeSubscriptions ?? [];
-  const active = subscriptions.find((sub) => String(sub.status ?? "").toUpperCase() === "ACTIVE") ?? subscriptions[0];
-  const subscriptionId = parseSubscriptionId(active?.id);
-  if (!subscriptionId) return null;
-  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",
-    subscriptionName: active?.name,
-    subscriptionId,
-    subscriptionPrice,
-    subscriptionPeriod
-  };
-}
 export {
   createProgusConnector,
   fetchActiveSubscriptionEventData,

package/package.json

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