@onesub/server 0.12.0 → 0.12.1

package/dist/index.cjs

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var express = require('express');
 var shared = require('@onesub/shared');
 var zod = require('zod');
@@ -732,6 +730,7 @@ async function fetchProductPurchase(packageName, productId, purchaseToken, acces
 async function acknowledgeGoogleSubscription(purchaseToken, productId, config) {
   if (config.mockMode) return;
   if (!config.serviceAccountKey) return;
+  if (!config.packageName) return;
   let accessToken;
   try {
     accessToken = await getCachedAccessToken(config.serviceAccountKey);
@@ -757,6 +756,7 @@ async function acknowledgeGoogleSubscription(purchaseToken, productId, config) {
 async function acknowledgeGoogleProduct(purchaseToken, productId, config) {
   if (config.mockMode) return;
   if (!config.serviceAccountKey) return;
+  if (!config.packageName) return;
   let accessToken;
   try {
     accessToken = await getCachedAccessToken(config.serviceAccountKey);
@@ -781,6 +781,7 @@ async function acknowledgeGoogleProduct(purchaseToken, productId, config) {
 }
 async function consumeGoogleProductReceipt(purchaseToken, productId, config) {
   if (!config.serviceAccountKey) return;
+  if (!config.packageName) return;
   let accessToken;
   try {
     accessToken = await getCachedAccessToken(config.serviceAccountKey);
@@ -828,6 +829,10 @@ async function validateGoogleReceipt(receipt, productId, config) {
     log.warn("[onesub/google] No serviceAccountKey provided \u2014 cannot call Play API");
     return null;
   }
+  if (!config.packageName) {
+    log.warn("[onesub/google] No packageName provided \u2014 cannot call Play API");
+    return null;
+  }
   let purchase;
   try {
     const token = await getCachedAccessToken(config.serviceAccountKey);
@@ -880,6 +885,10 @@ async function validateGoogleProductReceipt(purchaseToken, productId, config, ty
     log.warn("[onesub/google] No serviceAccountKey \u2014 cannot validate product receipt");
     return null;
   }
+  if (!config.packageName) {
+    log.warn("[onesub/google] No packageName \u2014 cannot validate product receipt");
+    return null;
+  }
   let purchase;
   try {
     const token = await getCachedAccessToken(config.serviceAccountKey);
@@ -1072,41 +1081,9 @@ function createStatusRouter(store) {
   });
   return router;
 }
-var GOOGLE_JWKS_URL = "https://www.googleapis.com/oauth2/v3/certs";
-var googleJwks = null;
-function getGoogleJwks() {
-  if (!googleJwks) {
-    googleJwks = jose.createRemoteJWKSet(new URL(GOOGLE_JWKS_URL));
-  }
-  return googleJwks;
-}
-async function verifyGooglePushToken(req, expectedAudience) {
-  const authHeader = req.headers["authorization"];
-  if (typeof authHeader !== "string" || !authHeader.startsWith("Bearer ")) {
-    return false;
-  }
-  const token = authHeader.slice("Bearer ".length).trim();
-  try {
-    await jose.jwtVerify(token, getGoogleJwks(), { audience: expectedAudience });
-    return true;
-  } catch {
-    return false;
-  }
-}
-var APPLE_ACTIVE_TYPES = /* @__PURE__ */ new Set([
-  "SUBSCRIBED",
-  "DID_RENEW",
-  "DID_RECOVER",
-  "OFFER_REDEEMED"
-]);
-var APPLE_CANCELED_TYPES = /* @__PURE__ */ new Set([
-  "REVOKE",
-  "REFUND",
-  "CONSUMPTION_REQUEST"
-]);
-var APPLE_EXPIRED_TYPES = /* @__PURE__ */ new Set([
-  "EXPIRED"
-]);
+var APPLE_ACTIVE_TYPES = /* @__PURE__ */ new Set(["SUBSCRIBED", "DID_RENEW", "DID_RECOVER", "OFFER_REDEEMED"]);
+var APPLE_CANCELED_TYPES = /* @__PURE__ */ new Set(["REVOKE", "REFUND", "CONSUMPTION_REQUEST"]);
+var APPLE_EXPIRED_TYPES = /* @__PURE__ */ new Set(["EXPIRED"]);
 function mapAppleNotificationStatus(notificationType, subtype) {
   if (notificationType === "DID_FAIL_TO_RENEW") {
     return subtype === "GRACE_PERIOD" ? shared.SUBSCRIPTION_STATUS.GRACE_PERIOD : shared.SUBSCRIPTION_STATUS.ON_HOLD;
@@ -1117,283 +1094,278 @@ function mapAppleNotificationStatus(notificationType, subtype) {
   if (APPLE_ACTIVE_TYPES.has(notificationType)) return shared.SUBSCRIPTION_STATUS.ACTIVE;
   return null;
 }
-function createWebhookRouter(config, store, purchaseStore, webhookEventStore) {
-  const router = express.Router();
-  router.post(shared.ROUTES.WEBHOOK_APPLE, async (req, res) => {
-    const body = req.body;
-    if (!body.signedPayload) {
-      sendError(res, 400, shared.ONESUB_ERROR_CODE.MISSING_SIGNED_PAYLOAD, "Missing signedPayload");
-      return;
-    }
-    let payload;
-    try {
-      payload = await decodeJws(
-        body.signedPayload,
-        config.apple?.skipJwsVerification
-      );
-    } catch (err) {
-      log.error("[onesub/webhook/apple] Failed to decode signedPayload:", err);
-      sendError(res, 400, shared.ONESUB_ERROR_CODE.INVALID_SIGNED_PAYLOAD, "Invalid signedPayload");
-      return;
-    }
-    if (webhookEventStore && typeof payload.notificationUUID === "string") {
-      const fresh = await webhookEventStore.markIfNew("apple", payload.notificationUUID);
-      if (!fresh) {
-        log.info("[onesub/webhook/apple] dedupe: already processed", payload.notificationUUID);
-        res.status(200).json({ received: true, deduped: true });
-        return;
-      }
-    }
-    const decoded = await decodeAppleNotification(payload, config.apple?.skipJwsVerification);
-    if (!decoded) {
-      res.status(200).json({ received: true });
+async function handleAppleWebhook(req, res, config, store, purchaseStore, webhookEventStore) {
+  const body = req.body;
+  if (!body.signedPayload) {
+    sendError(res, 400, shared.ONESUB_ERROR_CODE.MISSING_SIGNED_PAYLOAD, "Missing signedPayload");
+    return;
+  }
+  let payload;
+  try {
+    payload = await decodeJws(
+      body.signedPayload,
+      config.apple?.skipJwsVerification
+    );
+  } catch (err) {
+    log.error("[onesub/webhook/apple] Failed to decode signedPayload:", err);
+    sendError(res, 400, shared.ONESUB_ERROR_CODE.INVALID_SIGNED_PAYLOAD, "Invalid signedPayload");
+    return;
+  }
+  if (webhookEventStore && typeof payload.notificationUUID === "string") {
+    const fresh = await webhookEventStore.markIfNew("apple", payload.notificationUUID);
+    if (!fresh) {
+      log.info("[onesub/webhook/apple] dedupe: already processed", payload.notificationUUID);
+      res.status(200).json({ received: true, deduped: true });
       return;
     }
-    const {
-      originalTransactionId,
-      transactionId,
-      type,
-      productId,
-      bundleId,
-      environment,
-      status,
-      willRenew,
-      expiresAt
-    } = decoded;
-    const notificationType = payload.notificationType;
-    const subtype = payload.subtype;
-    const mapped = mapAppleNotificationStatus(notificationType, subtype);
-    const finalStatus = mapped ?? status;
-    if (notificationType === "CONSUMPTION_REQUEST" && config.apple?.consumptionInfoProvider && transactionId && productId) {
-      const provider = config.apple.consumptionInfoProvider;
-      const appleConfig = config.apple;
-      void (async () => {
-        try {
-          const info = await provider({
-            transactionId,
-            originalTransactionId,
-            productId,
-            bundleId: bundleId ?? appleConfig.bundleId,
-            environment
+  }
+  const decoded = await decodeAppleNotification(payload, config.apple?.skipJwsVerification);
+  if (!decoded) {
+    res.status(200).json({ received: true });
+    return;
+  }
+  const {
+    originalTransactionId,
+    transactionId,
+    type,
+    productId,
+    bundleId,
+    environment,
+    status,
+    willRenew,
+    expiresAt
+  } = decoded;
+  const notificationType = payload.notificationType;
+  const subtype = payload.subtype;
+  const mapped = mapAppleNotificationStatus(notificationType, subtype);
+  const finalStatus = mapped ?? status;
+  if (notificationType === "CONSUMPTION_REQUEST" && config.apple?.consumptionInfoProvider && transactionId && productId) {
+    const provider = config.apple.consumptionInfoProvider;
+    const appleConfig = config.apple;
+    void (async () => {
+      try {
+        const info = await provider({
+          transactionId,
+          originalTransactionId,
+          productId,
+          bundleId: bundleId ?? appleConfig.bundleId,
+          environment
+        });
+        if (info) {
+          await sendAppleConsumptionResponse(transactionId, info, appleConfig, {
+            sandbox: environment === "Sandbox"
           });
-          if (info) {
-            await sendAppleConsumptionResponse(transactionId, info, appleConfig, {
-              sandbox: environment === "Sandbox"
-            });
-          }
-        } catch (err) {
-          log.warn("[onesub/webhook/apple] consumptionInfoProvider failed:", err);
         }
-      })();
-    }
-    const isOneTimePurchase = type === "Consumable" || type === "Non-Consumable";
-    const isRefundOrRevoke = APPLE_CANCELED_TYPES.has(notificationType);
-    try {
-      if (isOneTimePurchase && isRefundOrRevoke) {
-        const lookupId = transactionId ?? originalTransactionId;
-        const removed = await purchaseStore.deletePurchaseByTransactionId(lookupId);
-        if (!removed) {
-          log.warn(
-            "[onesub/webhook/apple] IAP refund for unknown transaction:",
-            lookupId
-          );
-        }
-        res.status(200).json({ received: true });
-        return;
+      } catch (err) {
+        log.warn("[onesub/webhook/apple] consumptionInfoProvider failed:", err);
       }
-      const existing = await store.getByTransactionId(originalTransactionId);
-      if (existing) {
-        const isSubscriptionRefund = isRefundOrRevoke && !isOneTimePurchase && notificationType !== "CONSUMPTION_REQUEST";
-        const keepEntitlement = isSubscriptionRefund && config.refundPolicy === "until_expiry";
-        const updated = keepEntitlement ? { ...existing, willRenew: false } : {
-          ...existing,
-          status: finalStatus,
-          willRenew,
-          // expiresAt may be absent on non-subscription payloads — keep the
-          // previously-stored value rather than overwriting with null/empty.
-          expiresAt: expiresAt ?? existing.expiresAt
-        };
-        await store.save(updated);
-      } else if (config.apple?.issuerId && config.apple?.keyId && config.apple?.privateKey) {
-        const fresh = await fetchAppleSubscriptionStatus(originalTransactionId, config.apple, {
-          sandbox: environment === "Sandbox"
-        });
-        if (fresh) {
-          fresh.userId = originalTransactionId;
-          await store.save(fresh);
-        } else {
-          log.warn(
-            "[onesub/webhook/apple] Unknown transaction and Status API returned no record:",
-            originalTransactionId
-          );
-        }
-      } else {
-        log.warn(
-          "[onesub/webhook/apple] Received notification for unknown transaction (no API creds to recover):",
-          originalTransactionId
-        );
+    })();
+  }
+  const isOneTimePurchase = type === "Consumable" || type === "Non-Consumable";
+  const isRefundOrRevoke = APPLE_CANCELED_TYPES.has(notificationType);
+  try {
+    if (isOneTimePurchase && isRefundOrRevoke) {
+      const lookupId = transactionId ?? originalTransactionId;
+      const removed = await purchaseStore.deletePurchaseByTransactionId(lookupId);
+      if (!removed) {
+        log.warn("[onesub/webhook/apple] IAP refund for unknown transaction:", lookupId);
       }
       res.status(200).json({ received: true });
-    } catch (err) {
-      log.error("[onesub/webhook/apple] Store update error:", err);
-      sendError(res, 500, shared.ONESUB_ERROR_CODE.WEBHOOK_PROCESSING_FAILED, "Failed to update subscription");
-    }
-  });
-  router.post(shared.ROUTES.WEBHOOK_GOOGLE, async (req, res) => {
-    if (config.google?.pushAudience) {
-      const authenticated = await verifyGooglePushToken(req, config.google.pushAudience);
-      if (!authenticated) {
-        sendError(res, 401, shared.ONESUB_ERROR_CODE.UNAUTHORIZED, "Unauthorized");
-        return;
-      }
-    }
-    const body = req.body;
-    if (!body.message?.data) {
-      sendError(res, 400, shared.ONESUB_ERROR_CODE.MISSING_MESSAGE_DATA, "Missing message.data");
       return;
     }
-    if (webhookEventStore && typeof body.message.messageId === "string") {
-      const fresh = await webhookEventStore.markIfNew("google", body.message.messageId);
-      if (!fresh) {
-        log.info("[onesub/webhook/google] dedupe: already processed", body.message.messageId);
-        res.status(200).json({ received: true, deduped: true });
-        return;
-      }
-    }
-    const voided = decodeGoogleVoidedNotification(body);
-    if (voided) {
-      if (config.google?.packageName && voided.packageName !== config.google.packageName) {
+    const existing = await store.getByTransactionId(originalTransactionId);
+    if (existing) {
+      const isSubscriptionRefund = isRefundOrRevoke && !isOneTimePurchase && notificationType !== "CONSUMPTION_REQUEST";
+      const keepEntitlement = isSubscriptionRefund && config.refundPolicy === "until_expiry";
+      const updated = keepEntitlement ? { ...existing, willRenew: false } : {
+        ...existing,
+        status: finalStatus,
+        willRenew,
+        expiresAt: expiresAt ?? existing.expiresAt
+      };
+      await store.save(updated);
+    } else if (config.apple?.issuerId && config.apple?.keyId && config.apple?.privateKey) {
+      const fresh = await fetchAppleSubscriptionStatus(originalTransactionId, config.apple, {
+        sandbox: environment === "Sandbox"
+      });
+      if (fresh) {
+        fresh.userId = originalTransactionId;
+        await store.save(fresh);
+      } else {
         log.warn(
-          "[onesub/webhook/google] voided package name mismatch:",
-          voided.packageName,
-          "!==",
-          config.google.packageName
+          "[onesub/webhook/apple] Unknown transaction and Status API returned no record:",
+          originalTransactionId
         );
-        sendError(res, 400, shared.ONESUB_ERROR_CODE.PACKAGE_NAME_MISMATCH, "Package name mismatch");
-        return;
-      }
-      try {
-        if (voided.productType === 1) {
-          const existing = await store.getByTransactionId(voided.purchaseToken);
-          if (existing) {
-            const updated = config.refundPolicy === "until_expiry" ? { ...existing, willRenew: false } : { ...existing, status: shared.SUBSCRIPTION_STATUS.CANCELED };
-            await store.save(updated);
-          } else {
-            log.warn(
-              "[onesub/webhook/google] voided subscription for unknown purchaseToken:",
-              voided.purchaseToken
-            );
-          }
-        } else {
-          const removed = await purchaseStore.deletePurchaseByTransactionId(voided.orderId);
-          if (!removed) {
-            log.warn(
-              "[onesub/webhook/google] voided IAP for unknown orderId:",
-              voided.orderId
-            );
-          }
-        }
-        res.status(200).json({ received: true });
-      } catch (err) {
-        log.error("[onesub/webhook/google] voided notification error:", err);
-        sendError(res, 500, shared.ONESUB_ERROR_CODE.WEBHOOK_PROCESSING_FAILED, "Failed to process voided notification");
       }
+    } else {
+      log.warn(
+        "[onesub/webhook/apple] Received notification for unknown transaction (no API creds to recover):",
+        originalTransactionId
+      );
+    }
+    res.status(200).json({ received: true });
+  } catch (err) {
+    log.error("[onesub/webhook/apple] Store update error:", err);
+    sendError(res, 500, shared.ONESUB_ERROR_CODE.WEBHOOK_PROCESSING_FAILED, "Failed to update subscription");
+  }
+}
+var GOOGLE_JWKS_URL = "https://www.googleapis.com/oauth2/v3/certs";
+var googleJwks = null;
+function getGoogleJwks() {
+  if (!googleJwks) googleJwks = jose.createRemoteJWKSet(new URL(GOOGLE_JWKS_URL));
+  return googleJwks;
+}
+async function verifyGooglePushToken(req, expectedAudience) {
+  const authHeader = req.headers["authorization"];
+  if (typeof authHeader !== "string" || !authHeader.startsWith("Bearer ")) return false;
+  try {
+    await jose.jwtVerify(authHeader.slice("Bearer ".length).trim(), getGoogleJwks(), {
+      audience: expectedAudience
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function handleGoogleWebhook(req, res, config, store, purchaseStore, webhookEventStore) {
+  if (config.google?.pushAudience) {
+    const authenticated = await verifyGooglePushToken(req, config.google.pushAudience);
+    if (!authenticated) {
+      sendError(res, 401, shared.ONESUB_ERROR_CODE.UNAUTHORIZED, "Unauthorized");
       return;
     }
-    const notification = decodeGoogleNotification(body);
-    if (!notification) {
-      res.status(200).json({ received: true });
+  }
+  const body = req.body;
+  if (!body.message?.data) {
+    sendError(res, 400, shared.ONESUB_ERROR_CODE.MISSING_MESSAGE_DATA, "Missing message.data");
+    return;
+  }
+  if (webhookEventStore && typeof body.message.messageId === "string") {
+    const fresh = await webhookEventStore.markIfNew("google", body.message.messageId);
+    if (!fresh) {
+      log.info("[onesub/webhook/google] dedupe: already processed", body.message.messageId);
+      res.status(200).json({ received: true, deduped: true });
       return;
     }
-    const { notificationType, purchaseToken, subscriptionId, packageName } = notification;
-    if (config.google?.packageName && packageName !== config.google.packageName) {
-      log.warn(
-        "[onesub/webhook/google] Package name mismatch:",
-        packageName,
-        "!==",
-        config.google.packageName
-      );
+  }
+  const voided = decodeGoogleVoidedNotification(body);
+  if (voided) {
+    if (config.google?.packageName && voided.packageName !== config.google.packageName) {
+      log.warn("[onesub/webhook/google] voided package name mismatch:", voided.packageName, "!==", config.google.packageName);
       sendError(res, 400, shared.ONESUB_ERROR_CODE.PACKAGE_NAME_MISMATCH, "Package name mismatch");
       return;
     }
     try {
-      const existing = await store.getByTransactionId(purchaseToken);
-      let finalStatus;
-      if (isGoogleActiveNotification(notificationType)) {
-        finalStatus = shared.SUBSCRIPTION_STATUS.ACTIVE;
-      } else if (isGoogleGracePeriodNotification(notificationType)) {
-        finalStatus = shared.SUBSCRIPTION_STATUS.GRACE_PERIOD;
-      } else if (isGoogleOnHoldNotification(notificationType)) {
-        finalStatus = shared.SUBSCRIPTION_STATUS.ON_HOLD;
-      } else if (isGooglePausedNotification(notificationType)) {
-        finalStatus = shared.SUBSCRIPTION_STATUS.PAUSED;
-      } else if (isGooglePriceChangeConfirmedNotification(notificationType)) {
-        finalStatus = shared.SUBSCRIPTION_STATUS.ACTIVE;
-      } else if (isGoogleCanceledNotification(notificationType)) {
-        finalStatus = shared.SUBSCRIPTION_STATUS.CANCELED;
-      } else if (isGoogleExpiredNotification(notificationType)) {
-        finalStatus = shared.SUBSCRIPTION_STATUS.EXPIRED;
+      if (voided.productType === 1) {
+        const existing = await store.getByTransactionId(voided.purchaseToken);
+        if (existing) {
+          const updated = config.refundPolicy === "until_expiry" ? { ...existing, willRenew: false } : { ...existing, status: shared.SUBSCRIPTION_STATUS.CANCELED };
+          await store.save(updated);
+        } else {
+          log.warn("[onesub/webhook/google] voided subscription for unknown purchaseToken:", voided.purchaseToken);
+        }
       } else {
-        finalStatus = shared.SUBSCRIPTION_STATUS.ACTIVE;
-      }
-      if (isGooglePriceChangeConfirmedNotification(notificationType) && config.google?.onPriceChangeConfirmed) {
-        const hook = config.google.onPriceChangeConfirmed;
-        void Promise.resolve().then(() => hook({ purchaseToken, subscriptionId, packageName })).catch((err) => log.warn("[onesub/webhook/google] onPriceChangeConfirmed hook failed:", err));
+        const removed = await purchaseStore.deletePurchaseByTransactionId(voided.orderId);
+        if (!removed) {
+          log.warn("[onesub/webhook/google] voided IAP for unknown orderId:", voided.orderId);
+        }
       }
-      if (existing) {
-        let updated = { ...existing, status: finalStatus };
-        if (config.google?.serviceAccountKey) {
-          const fresh = await validateGoogleReceipt(purchaseToken, subscriptionId, config.google);
-          if (fresh) {
-            const preserveNotificationStatus = finalStatus === shared.SUBSCRIPTION_STATUS.GRACE_PERIOD || finalStatus === shared.SUBSCRIPTION_STATUS.ON_HOLD;
-            updated = {
-              ...existing,
-              status: preserveNotificationStatus ? finalStatus : fresh.status,
-              expiresAt: fresh.expiresAt,
-              willRenew: fresh.willRenew,
-              // Propagate v2-only fields that fresh may have updated. Without
-              // these, paused→active transitions left autoResumeTime stale and
-              // upgrade chains lost their linkedPurchaseToken on subsequent
-              // notifications. Use ?? undefined so cleared values become undefined
-              // (e.g. resume from paused → autoResumeTime should disappear).
-              autoResumeTime: fresh.autoResumeTime,
-              linkedPurchaseToken: fresh.linkedPurchaseToken ?? existing.linkedPurchaseToken
-            };
-          }
+      res.status(200).json({ received: true });
+    } catch (err) {
+      log.error("[onesub/webhook/google] voided notification error:", err);
+      sendError(res, 500, shared.ONESUB_ERROR_CODE.WEBHOOK_PROCESSING_FAILED, "Failed to process voided notification");
+    }
+    return;
+  }
+  const notification = decodeGoogleNotification(body);
+  if (!notification) {
+    res.status(200).json({ received: true });
+    return;
+  }
+  const { notificationType, purchaseToken, subscriptionId, packageName } = notification;
+  if (config.google?.packageName && packageName !== config.google.packageName) {
+    log.warn("[onesub/webhook/google] Package name mismatch:", packageName, "!==", config.google.packageName);
+    sendError(res, 400, shared.ONESUB_ERROR_CODE.PACKAGE_NAME_MISMATCH, "Package name mismatch");
+    return;
+  }
+  try {
+    const existing = await store.getByTransactionId(purchaseToken);
+    let finalStatus;
+    if (isGoogleActiveNotification(notificationType)) {
+      finalStatus = shared.SUBSCRIPTION_STATUS.ACTIVE;
+    } else if (isGoogleGracePeriodNotification(notificationType)) {
+      finalStatus = shared.SUBSCRIPTION_STATUS.GRACE_PERIOD;
+    } else if (isGoogleOnHoldNotification(notificationType)) {
+      finalStatus = shared.SUBSCRIPTION_STATUS.ON_HOLD;
+    } else if (isGooglePausedNotification(notificationType)) {
+      finalStatus = shared.SUBSCRIPTION_STATUS.PAUSED;
+    } else if (isGooglePriceChangeConfirmedNotification(notificationType)) {
+      finalStatus = shared.SUBSCRIPTION_STATUS.ACTIVE;
+    } else if (isGoogleCanceledNotification(notificationType)) {
+      finalStatus = shared.SUBSCRIPTION_STATUS.CANCELED;
+    } else if (isGoogleExpiredNotification(notificationType)) {
+      finalStatus = shared.SUBSCRIPTION_STATUS.EXPIRED;
+    } else {
+      finalStatus = shared.SUBSCRIPTION_STATUS.ACTIVE;
+    }
+    if (isGooglePriceChangeConfirmedNotification(notificationType) && config.google?.onPriceChangeConfirmed) {
+      const hook = config.google.onPriceChangeConfirmed;
+      void Promise.resolve().then(() => hook({ purchaseToken, subscriptionId, packageName })).catch((err) => log.warn("[onesub/webhook/google] onPriceChangeConfirmed hook failed:", err));
+    }
+    if (existing) {
+      let updated = { ...existing, status: finalStatus };
+      if (config.google?.serviceAccountKey) {
+        const fresh = await validateGoogleReceipt(purchaseToken, subscriptionId, config.google);
+        if (fresh) {
+          const preserveNotificationStatus = finalStatus === shared.SUBSCRIPTION_STATUS.GRACE_PERIOD || finalStatus === shared.SUBSCRIPTION_STATUS.ON_HOLD;
+          updated = {
+            ...existing,
+            status: preserveNotificationStatus ? finalStatus : fresh.status,
+            expiresAt: fresh.expiresAt,
+            willRenew: fresh.willRenew,
+            autoResumeTime: fresh.autoResumeTime,
+            linkedPurchaseToken: fresh.linkedPurchaseToken ?? existing.linkedPurchaseToken
+          };
         }
-        await store.save(updated);
-      } else {
-        if (config.google?.serviceAccountKey) {
-          const fresh = await validateGoogleReceipt(purchaseToken, subscriptionId, config.google);
-          if (fresh) {
-            if (fresh.linkedPurchaseToken) {
-              const previous = await store.getByTransactionId(fresh.linkedPurchaseToken);
-              if (previous) {
-                fresh.userId = previous.userId;
-                log.info(
-                  `[onesub/webhook/google] inherited userId ${previous.userId} from linkedPurchaseToken ${fresh.linkedPurchaseToken} \u2192 new token ${purchaseToken}`
-                );
-              } else {
-                fresh.userId = purchaseToken;
-              }
-            } else {
-              fresh.userId = purchaseToken;
+      }
+      await store.save(updated);
+    } else {
+      if (config.google?.serviceAccountKey) {
+        const fresh = await validateGoogleReceipt(purchaseToken, subscriptionId, config.google);
+        if (fresh) {
+          if (fresh.linkedPurchaseToken) {
+            const previous = await store.getByTransactionId(fresh.linkedPurchaseToken);
+            fresh.userId = previous ? previous.userId : purchaseToken;
+            if (previous) {
+              log.info(`[onesub/webhook/google] inherited userId ${previous.userId} from linkedPurchaseToken ${fresh.linkedPurchaseToken} \u2192 new token ${purchaseToken}`);
             }
-            await store.save(fresh);
+          } else {
+            fresh.userId = purchaseToken;
           }
-        } else {
-          log.warn(
-            "[onesub/webhook/google] Unknown purchase token and no serviceAccountKey to re-fetch:",
-            purchaseToken
-          );
+          await store.save(fresh);
         }
+      } else {
+        log.warn("[onesub/webhook/google] Unknown purchase token and no serviceAccountKey to re-fetch:", purchaseToken);
       }
-      res.status(200).json({ received: true });
-    } catch (err) {
-      log.error("[onesub/webhook/google] Error handling notification:", err);
-      sendError(res, 500, shared.ONESUB_ERROR_CODE.WEBHOOK_PROCESSING_FAILED, "Failed to process notification");
     }
-  });
+    res.status(200).json({ received: true });
+  } catch (err) {
+    log.error("[onesub/webhook/google] Error handling notification:", err);
+    sendError(res, 500, shared.ONESUB_ERROR_CODE.WEBHOOK_PROCESSING_FAILED, "Failed to process notification");
+  }
+}
+
+// src/routes/webhook.ts
+function createWebhookRouter(config, store, purchaseStore, webhookEventStore) {
+  const router = express.Router();
+  router.post(
+    shared.ROUTES.WEBHOOK_APPLE,
+    (req, res) => handleAppleWebhook(req, res, config, store, purchaseStore, webhookEventStore)
+  );
+  router.post(
+    shared.ROUTES.WEBHOOK_GOOGLE,
+    (req, res) => handleGoogleWebhook(req, res, config, store, purchaseStore, webhookEventStore)
+  );
   return router;
 }
 var NO_PURCHASE = { valid: false, purchase: null };
@@ -3057,7 +3029,6 @@ function createOneSubServer(config) {
   app.use(createOneSubMiddleware(config));
   return app;
 }
-var index_default = createOneSubMiddleware;
 var isMain = typeof process !== "undefined" && process.argv[1] != null && new URL((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href))).pathname.endsWith(process.argv[1].replace(/\\/g, "/"));
 if (isMain) {
   const config = {
@@ -3099,7 +3070,6 @@ exports.RedisSubscriptionStore = RedisSubscriptionStore;
 exports.RedisWebhookEventStore = RedisWebhookEventStore;
 exports.createOneSubMiddleware = createOneSubMiddleware;
 exports.createOneSubServer = createOneSubServer;
-exports.default = index_default;
 exports.evaluateEntitlement = evaluateEntitlement;
 exports.fetchAppleSubscriptionStatus = fetchAppleSubscriptionStatus;
 exports.getDefaultCache = getDefaultCache;