@onesub/server 0.21.2 → 0.23.0

package/dist/index.js

@@ -1744,18 +1744,22 @@ var GOOGLE_FAILURE_MESSAGES = {
     message: "Failed to process notification"
   }
 };
+function servesGoogle(config) {
+  return getAppRegistry(config).apps.some((app) => !!app.google);
+}
 function warnIfGoogleWebhookOpen(config) {
   if (process.env["NODE_ENV"] !== "production") return;
+  if (!servesGoogle(config)) return;
   const apps = getAppRegistry(config).apps;
   const googleApps = apps.map((a) => a.google).filter((g) => !!g);
-  if (googleApps.length > 0 && !googleApps.some((g) => g.pushAudience)) {
+  if (!googleApps.some((g) => g.pushAudience)) {
     log.warn(
       "[onesub] SECURITY: POST /onesub/webhook/google accepts unauthenticated requests \u2014 no configured app sets google.pushAudience, so the Pub/Sub OIDC token is never verified. A caller who knows a purchaseToken or orderId can cancel a subscription or delete a one-time purchase. Set google.pushAudience (and google.pushServiceAccountEmail)."
     );
   }
   if (!apps.some((a) => a.google?.packageName)) {
     log.warn(
-      "[onesub] POST /onesub/webhook/google is in open mode \u2014 no configured app declares google.packageName, so notifications for ANY package are accepted. The route is mounted whether or not Google is configured; set google.packageName, or block the path at your proxy if this deployment does not serve Google Play."
+      "[onesub] POST /onesub/webhook/google is in open mode \u2014 no configured app declares google.packageName, so notifications for ANY package are accepted. Set google.packageName on each app you serve."
     );
   }
 }
@@ -1974,10 +1978,12 @@ function createWebhookRouter(config, store, purchaseStore, webhookEventStore, we
     ROUTES.WEBHOOK_APPLE,
     (req, res) => handleAppleWebhook(req, res, config, store, purchaseStore, webhookEventStore, webhookQueue)
   );
-  router.post(
-    ROUTES.WEBHOOK_GOOGLE,
-    (req, res) => handleGoogleWebhook(req, res, config, store, purchaseStore, webhookEventStore, webhookQueue)
-  );
+  if (servesGoogle(config)) {
+    router.post(
+      ROUTES.WEBHOOK_GOOGLE,
+      (req, res) => handleGoogleWebhook(req, res, config, store, purchaseStore, webhookEventStore, webhookQueue)
+    );
+  }
   return router;
 }
 var NO_PURCHASE = { valid: false, purchase: null };
@@ -2536,33 +2542,44 @@ function isEndedSubscription(sub) {
 function isNonConsumable(purchase) {
   return purchase.type === PURCHASE_TYPE.NON_CONSUMABLE;
 }
-function aggregateActive(subs, purchases, nowMs) {
+function aggregateActiveSubscriptions(subs, nowMs) {
   const byProduct = {};
-  const byProductPurchases = {};
   const byPlatform = {};
-  let activeSubscriptions = 0;
-  let gracePeriodSubscriptions = 0;
-  let nonConsumablePurchases = 0;
+  let active = 0;
+  let gracePeriod = 0;
   for (const sub of subs) {
     if (!isActiveSubscription(sub, nowMs)) continue;
-    activeSubscriptions++;
-    if (sub.status === SUBSCRIPTION_STATUS.GRACE_PERIOD) gracePeriodSubscriptions++;
+    active++;
+    if (sub.status === SUBSCRIPTION_STATUS.GRACE_PERIOD) gracePeriod++;
     bump(byProduct, sub.productId);
     bump(byPlatform, sub.platform);
   }
+  return { active, gracePeriod, byProduct, byPlatform };
+}
+function aggregateNonConsumablePurchases(purchases) {
+  const byProduct = {};
+  const byPlatform = {};
+  let total = 0;
   for (const purchase of purchases) {
     if (!isNonConsumable(purchase)) continue;
-    nonConsumablePurchases++;
-    bump(byProductPurchases, purchase.productId);
+    total++;
+    bump(byProduct, purchase.productId);
     bump(byPlatform, purchase.platform);
   }
+  return { total, byProduct, byPlatform };
+}
+function composeActiveResponse(subs, purchases) {
+  const byPlatform = { ...subs.byPlatform };
+  for (const [platform, count] of Object.entries(purchases.byPlatform)) {
+    byPlatform[platform] = (byPlatform[platform] ?? 0) + count;
+  }
   return {
-    total: activeSubscriptions + nonConsumablePurchases,
-    activeSubscriptions,
-    gracePeriodSubscriptions,
-    nonConsumablePurchases,
-    byProduct,
-    byProductPurchases,
+    total: subs.active + purchases.total,
+    activeSubscriptions: subs.active,
+    gracePeriodSubscriptions: subs.gracePeriod,
+    nonConsumablePurchases: purchases.total,
+    byProduct: subs.byProduct,
+    byProductPurchases: purchases.byProduct,
     byPlatform
   };
 }
@@ -2625,8 +2642,12 @@ function createMetricsRouter(config, store, purchaseStore) {
       const response = await metricsCache.resolve(
         ["active", metricsCache.quantizeToWindow(Date.now())],
         async () => {
-          const [subs, purchases] = await Promise.all([store.listAll(), purchaseStore.listAll()]);
-          return aggregateActive(subs, purchases, Date.now());
+          const now = /* @__PURE__ */ new Date();
+          const [subsAgg, purchasesAgg] = await Promise.all([
+            store.aggregateActive ? store.aggregateActive(now) : store.listAll().then((subs) => aggregateActiveSubscriptions(subs, now.getTime())),
+            purchaseStore.aggregateNonConsumable ? purchaseStore.aggregateNonConsumable() : purchaseStore.listAll().then(aggregateNonConsumablePurchases)
+          ]);
+          return composeActiveResponse(subsAgg, purchasesAgg);
         }
       );
       res.status(200).json(response);
@@ -2659,7 +2680,7 @@ function createMetricsRouter(config, store, purchaseStore) {
     }
     return { fromMs, toMs, groupBy };
   }
-  function windowed(name, load, anchor, include) {
+  function windowed(name, sqlAggregate, load, anchor, include) {
     return async (req, res) => {
       const range = parseRange(req);
       if ("error" in range) {
@@ -2674,13 +2695,22 @@ function createMetricsRouter(config, store, purchaseStore) {
             metricsCache.quantizeToWindow(range.toMs),
             range.groupBy
           ],
-          async () => aggregateRange(await load(), {
-            fromMs: range.fromMs,
-            toMs: range.toMs,
-            groupBy: range.groupBy,
-            anchor,
-            ...include ? { include } : {}
-          })
+          async () => {
+            if (sqlAggregate) {
+              return sqlAggregate({
+                from: new Date(range.fromMs),
+                to: new Date(range.toMs),
+                groupBy: range.groupBy
+              });
+            }
+            return aggregateRange(await load(), {
+              fromMs: range.fromMs,
+              toMs: range.toMs,
+              groupBy: range.groupBy,
+              anchor,
+              ...include ? { include } : {}
+            });
+          }
         );
         const response = {
           from: req.query["from"],
@@ -2696,12 +2726,18 @@ function createMetricsRouter(config, store, purchaseStore) {
   }
   router.get(
     ROUTES.METRICS_STARTED,
-    windowed("started", () => store.listAll(), (sub) => sub.purchasedAt)
+    windowed(
+      "started",
+      store.aggregateStarted?.bind(store),
+      () => store.listAll(),
+      (sub) => sub.purchasedAt
+    )
   );
   router.get(
     ROUTES.METRICS_EXPIRED,
     windowed(
       "expired",
+      store.aggregateExpired?.bind(store),
       () => store.listAll(),
       (sub) => sub.expiresAt,
       isEndedSubscription
@@ -2711,6 +2747,7 @@ function createMetricsRouter(config, store, purchaseStore) {
     ROUTES.METRICS_PURCHASES_STARTED,
     windowed(
       "purchases-started",
+      purchaseStore.aggregateStarted?.bind(purchaseStore),
       () => purchaseStore.listAll(),
       (purchase) => purchase.purchasedAt,
       isNonConsumable
@@ -2986,6 +3023,52 @@ var PostgresSubscriptionStore = class {
       offset
     };
   }
+  /**
+   * Counts of subscriptions currently granting entitlement.
+   *
+   * One `GROUP BY` instead of reading every row into the process. Grouping by
+   * status as well as product/platform is what lets the grace-period subset come
+   * out of the same query.
+   */
+  async aggregateActive(now) {
+    const pool = await this.getPool();
+    const result = await pool.query(
+      `SELECT product_id, platform, status, COUNT(*)::text AS n
+         FROM onesub_subscriptions
+        WHERE status IN ($1, $2) AND expires_at > $3
+        GROUP BY product_id, platform, status`,
+      [SUBSCRIPTION_STATUS.ACTIVE, SUBSCRIPTION_STATUS.GRACE_PERIOD, now]
+    );
+    const byProduct = {};
+    const byPlatform = {};
+    let active = 0;
+    let gracePeriod = 0;
+    for (const row of result.rows) {
+      const n = parseInt(row.n, 10);
+      active += n;
+      if (row.status === SUBSCRIPTION_STATUS.GRACE_PERIOD) gracePeriod += n;
+      byProduct[row.product_id] = (byProduct[row.product_id] ?? 0) + n;
+      byPlatform[row.platform] = (byPlatform[row.platform] ?? 0) + n;
+    }
+    return { active, gracePeriod, byProduct, byPlatform };
+  }
+  /** Cohort-start counts: subscriptions whose `purchased_at` is in the window. */
+  async aggregateStarted(query) {
+    const pool = await this.getPool();
+    return aggregateViaSql(pool, "onesub_subscriptions", "purchased_at", query);
+  }
+  /**
+   * Subscriptions that have ended AND whose `expires_at` is in the window. A
+   * still-active record does not count even if its expiry lands inside it — see
+   * `isEndedSubscription`, which this mirrors.
+   */
+  async aggregateExpired(query) {
+    const pool = await this.getPool();
+    return aggregateViaSql(pool, "onesub_subscriptions", "expires_at", query, {
+      column: "status",
+      values: [SUBSCRIPTION_STATUS.EXPIRED, SUBSCRIPTION_STATUS.CANCELED]
+    });
+  }
   /** Gracefully close the underlying connection pool. */
   async close() {
     if (this.poolPromise) {
@@ -3126,6 +3209,35 @@ var PostgresPurchaseStore = class {
     const result = await pool.query(`SELECT * FROM onesub_purchases`);
     return result.rows.map(rowToPurchaseInfo);
   }
+  /** Counts of non-consumable purchases. Consumables are excluded. */
+  async aggregateNonConsumable() {
+    const pool = await this.getPool();
+    const result = await pool.query(
+      `SELECT product_id, platform, COUNT(*)::text AS n
+         FROM onesub_purchases
+        WHERE type = $1
+        GROUP BY product_id, platform`,
+      [PURCHASE_TYPE.NON_CONSUMABLE]
+    );
+    const byProduct = {};
+    const byPlatform = {};
+    let total = 0;
+    for (const row of result.rows) {
+      const n = parseInt(row.n, 10);
+      total += n;
+      byProduct[row.product_id] = (byProduct[row.product_id] ?? 0) + n;
+      byPlatform[row.platform] = (byPlatform[row.platform] ?? 0) + n;
+    }
+    return { total, byProduct, byPlatform };
+  }
+  /** Non-consumable purchases whose `purchased_at` is in the window. */
+  async aggregateStarted(query) {
+    const pool = await this.getPool();
+    return aggregateViaSql(pool, "onesub_purchases", "purchased_at", query, {
+      column: "type",
+      values: [PURCHASE_TYPE.NON_CONSUMABLE]
+    });
+  }
   /** Gracefully close the underlying connection pool. */
   async close() {
     if (this.poolPromise) {
@@ -3135,6 +3247,42 @@ var PostgresPurchaseStore = class {
     }
   }
 };
+async function aggregateViaSql(pool, table, anchorColumn, query, filter) {
+  const params = [query.from, query.to];
+  let filterClause = "";
+  if (filter) {
+    const placeholders = filter.values.map((_, i) => `$${params.length + i + 1}`).join(", ");
+    filterClause = `AND ${filter.column} IN (${placeholders})`;
+    params.push(...filter.values);
+  }
+  const bucketing = query.groupBy === "day";
+  const dayExpr = `to_char(date_trunc('day', ${anchorColumn} AT TIME ZONE 'UTC'), 'YYYY-MM-DD')`;
+  const result = await pool.query(
+    `SELECT product_id, platform,${bucketing ? ` ${dayExpr} AS day,` : ""}
+            COUNT(*)::text AS n
+       FROM ${table}
+      WHERE ${anchorColumn} >= $1 AND ${anchorColumn} <= $2 ${filterClause}
+      GROUP BY product_id, platform${bucketing ? ", day" : ""}`,
+    params
+  );
+  const byProduct = {};
+  const byPlatform = {};
+  const perDay = /* @__PURE__ */ new Map();
+  let total = 0;
+  for (const row of result.rows) {
+    const n = parseInt(row.n, 10);
+    total += n;
+    byProduct[row.product_id] = (byProduct[row.product_id] ?? 0) + n;
+    byPlatform[row.platform] = (byPlatform[row.platform] ?? 0) + n;
+    if (bucketing && row.day) perDay.set(row.day, (perDay.get(row.day) ?? 0) + n);
+  }
+  if (!bucketing) return { total, byProduct, byPlatform };
+  const buckets = emptyDailyBuckets(query.from.getTime(), query.to.getTime()).map((b) => ({
+    date: b.date,
+    count: perDay.get(b.date) ?? 0
+  }));
+  return { total, byProduct, byPlatform, buckets };
+}
 function rowToSubscriptionInfo(row) {
   return {
     originalTransactionId: row.original_transaction_id,