@onesub/server 0.17.1 → 0.18.1

package/dist/index.js

@@ -1166,23 +1166,95 @@ function sendZodError(res, err2, extra = {}) {
   );
 }
 
+// src/apps.ts
+function appName(app) {
+  return app.id || app.apple?.bundleId || app.google?.packageName || "default";
+}
+var registryCache = /* @__PURE__ */ new WeakMap();
+function getAppRegistry(config) {
+  const cached = registryCache.get(config);
+  if (cached) return cached;
+  const registry = buildAppRegistry(config);
+  registryCache.set(config, registry);
+  return registry;
+}
+function buildAppRegistry(config) {
+  const apps = [...config.apps ?? []];
+  if (config.apple || config.google) {
+    const id = config.defaultAppId || config.apple?.bundleId || config.google?.packageName || "default";
+    if (!apps.some((a) => a.id === id)) {
+      apps.unshift({ id, apple: config.apple, google: config.google });
+    }
+  }
+  const defaultApp = apps.find((a) => a.id === config.defaultAppId) ?? // No explicit default: fall back to the top-level config, which unshifted to
+  // the front above. Never silently pick an arbitrary app when several exist —
+  // that would validate one app's receipt against another's credentials.
+  (config.apple || config.google || apps.length === 1 ? apps[0] : void 0);
+  if (apps.length > 1) {
+    log.info("[onesub] Multi-app mode:", apps.map(appName).join(", "), "| default:", defaultApp ? appName(defaultApp) : "(none)");
+  }
+  function match(hint) {
+    if (hint.appId) {
+      const byId = apps.find(
+        (a) => a.id === hint.appId || a.apple?.bundleId === hint.appId || a.google?.packageName === hint.appId
+      );
+      if (byId) return byId;
+      log.warn("[onesub] Unknown appId:", hint.appId);
+      return void 0;
+    }
+    if (hint.bundleId) {
+      const byBundle = apps.find((a) => a.apple?.bundleId === hint.bundleId);
+      if (byBundle) return byBundle;
+      log.warn("[onesub] No app configured for bundleId:", hint.bundleId);
+      return void 0;
+    }
+    return defaultApp;
+  }
+  return {
+    apps,
+    defaultApp,
+    configFor(hint) {
+      const app = match(hint);
+      if (!app) {
+        return { ...config, apple: void 0, google: void 0 };
+      }
+      return { ...config, apple: app.apple, google: app.google };
+    }
+  };
+}
+function peekAppleBundleId(jws) {
+  try {
+    const payload = jws.split(".")[1];
+    if (!payload) return void 0;
+    const json = Buffer.from(payload, "base64url").toString("utf-8");
+    const claims = JSON.parse(json);
+    return typeof claims.bundleId === "string" ? claims.bundleId : void 0;
+  } catch {
+    return void 0;
+  }
+}
+
 // src/routes/validate.ts
 var NO_SUB = { valid: false, subscription: null };
 var validateSchema = z.object({
   platform: z.enum(["apple", "google"]),
   receipt: z.string().min(1).max(1e4),
   userId: z.string().min(1).max(256),
-  productId: z.string().min(1).max(256)
+  productId: z.string().min(1).max(256),
+  /** Which app this receipt belongs to. Optional — see OneSubServerConfig.apps. */
+  appId: z.string().min(1).max(256).optional()
 });
 function createValidateRouter(config, store) {
   const router = Router();
+  const registry = getAppRegistry(config);
   router.post(ROUTES.VALIDATE, async (req, res) => {
     let platform;
     let receipt;
     let userId;
     let productId;
+    let appId;
     try {
-      ({ platform, receipt, userId, productId } = validateSchema.parse(req.body));
+      ({ platform, receipt, userId, productId, appId } = validateSchema.parse(req.body));
     } catch (err2) {
       if (err2 instanceof z.ZodError) {
         sendZodError(res, err2, NO_SUB);
@@ -1192,18 +1264,22 @@ function createValidateRouter(config, store) {
     }
     try {
       let sub = null;
+      const appConfig = registry.configFor({
+        appId,
+        bundleId: platform === "apple" ? peekAppleBundleId(receipt) : void 0
+      });
       if (platform === "apple") {
-        if (!config.apple) {
+        if (!appConfig.apple) {
           sendError(res, 500, ONESUB_ERROR_CODE.APPLE_CONFIG_MISSING, "Apple configuration not provided", NO_SUB);
           return;
         }
-        sub = await validateAppleReceipt(receipt, config.apple);
+        sub = await validateAppleReceipt(receipt, appConfig.apple);
       } else {
-        if (!config.google) {
+        if (!appConfig.google) {
           sendError(res, 500, ONESUB_ERROR_CODE.GOOGLE_CONFIG_MISSING, "Google configuration not provided", NO_SUB);
           return;
         }
-        sub = await validateGoogleReceipt(receipt, productId, config.google);
+        sub = await validateGoogleReceipt(receipt, productId, appConfig.google);
       }
       if (!sub) {
         sendError(res, 422, ONESUB_ERROR_CODE.RECEIPT_VALIDATION_FAILED, "Receipt validation failed", NO_SUB);
@@ -1227,8 +1303,8 @@ function createValidateRouter(config, store) {
       }
       sub.userId = userId;
       await store.save(sub);
-      if (platform === "google" && config.google) {
-        void acknowledgeGoogleSubscription(receipt, productId, config.google);
+      if (platform === "google" && appConfig.google) {
+        void acknowledgeGoogleSubscription(receipt, productId, appConfig.google);
       }
       const response = { valid: true, subscription: sub };
       res.status(200).json(response);
@@ -1352,11 +1428,12 @@ async function processAppleNotification(work, config, store, purchaseStore) {
     appAccountToken,
     inAppOwnershipType
   } = work.decoded;
+  const appleConfigForApp = getAppRegistry(config).configFor({ bundleId }).apple;
   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;
+  if (notificationType === "CONSUMPTION_REQUEST" && appleConfigForApp?.consumptionInfoProvider && transactionId && productId) {
+    const provider = appleConfigForApp.consumptionInfoProvider;
+    const appleConfig = appleConfigForApp;
     void (async () => {
       try {
         const info = await provider({
@@ -1405,8 +1482,8 @@ async function processAppleNotification(work, config, store, purchaseStore) {
       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, {
+  } else if (appleConfigForApp?.issuerId && appleConfigForApp?.keyId && appleConfigForApp?.privateKey) {
+    const fresh = await fetchAppleSubscriptionStatus(originalTransactionId, appleConfigForApp, {
       sandbox: environment === "Sandbox"
     });
     if (fresh) {
@@ -1461,8 +1538,9 @@ async function handleAppleWebhook(req, res, config, store, purchaseStore, webhoo
     res.status(200).json({ received: true });
     return;
   }
-  if (config.apple?.bundleId && decoded.bundleId && decoded.bundleId !== config.apple.bundleId) {
-    log.warn("[onesub/webhook/apple] Bundle ID mismatch:", decoded.bundleId, "!==", config.apple.bundleId);
+  const notifiedApp = getAppRegistry(config).configFor({ bundleId: decoded.bundleId });
+  if (decoded.bundleId && !notifiedApp.apple) {
+    log.warn("[onesub/webhook/apple] No app configured for bundleId:", decoded.bundleId);
     sendError(res, 400, ONESUB_ERROR_CODE.BUNDLE_ID_MISMATCH, "Bundle ID mismatch");
     return;
   }
@@ -1539,7 +1617,17 @@ var GOOGLE_FAILURE_MESSAGES = {
     message: "Failed to process notification"
   }
 };
+function googleResolver(config) {
+  const registry = getAppRegistry(config);
+  const restricted = registry.apps.some((app) => !!app.google?.packageName);
+  return {
+    registry,
+    serves: (packageName) => !restricted || !!registry.configFor({ appId: packageName }).google,
+    googleFor: (packageName) => restricted ? registry.configFor({ appId: packageName }).google : registry.defaultApp?.google ?? config.google
+  };
+}
 async function processGoogleNotification(work, config, store, purchaseStore) {
+  const { googleFor } = googleResolver(config);
   if (work.kind === "voided") {
     const { voided } = work;
     if (voided.productType === 1) {
@@ -1562,8 +1650,9 @@ async function processGoogleNotification(work, config, store, purchaseStore) {
     const { notificationType: notificationType2, purchaseToken: purchaseToken2, sku } = work.oneTimeProduct;
     if (notificationType2 === 1) {
       log.info("[onesub/webhook/google] oneTimeProduct PURCHASED:", sku);
-      if (config.google?.serviceAccountKey && config.google.packageName) {
-        void acknowledgeGoogleProduct(purchaseToken2, sku, config.google).catch(
+      const googleCfg = googleFor(work.oneTimeProduct.packageName);
+      if (googleCfg?.serviceAccountKey && googleCfg.packageName) {
+        void acknowledgeGoogleProduct(purchaseToken2, sku, googleCfg).catch(
           (err2) => log.warn(`[onesub/webhook/google] oneTimeProduct ack failed for SKU ${sku} \u2014 3-day auto-refund risk:`, err2)
         );
       }
@@ -1592,14 +1681,15 @@ async function processGoogleNotification(work, config, store, purchaseStore) {
   } else {
     finalStatus = existing?.status ?? SUBSCRIPTION_STATUS.ACTIVE;
   }
-  if (isGooglePriceChangeConfirmedNotification(notificationType) && config.google?.onPriceChangeConfirmed) {
-    const hook = config.google.onPriceChangeConfirmed;
+  const subGoogleCfg = googleFor(packageName);
+  if (isGooglePriceChangeConfirmedNotification(notificationType) && subGoogleCfg?.onPriceChangeConfirmed) {
+    const hook = subGoogleCfg.onPriceChangeConfirmed;
     void Promise.resolve().then(() => hook({ purchaseToken, subscriptionId, packageName })).catch((err2) => log.warn("[onesub/webhook/google] onPriceChangeConfirmed hook failed:", err2));
   }
   if (existing) {
     let updated = { ...existing, status: finalStatus };
-    if (config.google?.serviceAccountKey) {
-      const fresh = await validateGoogleReceipt(purchaseToken, subscriptionId, config.google);
+    if (subGoogleCfg?.serviceAccountKey) {
+      const fresh = await validateGoogleReceipt(purchaseToken, subscriptionId, subGoogleCfg);
       if (fresh) {
         const preserveNotificationStatus = isGoogleGracePeriodNotification(notificationType) || isGoogleOnHoldNotification(notificationType);
         updated = {
@@ -1614,8 +1704,8 @@ async function processGoogleNotification(work, config, store, purchaseStore) {
     }
     await store.save(updated);
   } else {
-    if (config.google?.serviceAccountKey) {
-      const fresh = await validateGoogleReceipt(purchaseToken, subscriptionId, config.google);
+    if (subGoogleCfg?.serviceAccountKey) {
+      const fresh = await validateGoogleReceipt(purchaseToken, subscriptionId, subGoogleCfg);
       if (fresh) {
         const boundAccountId = fresh.boundAccountId;
         delete fresh.boundAccountId;
@@ -1636,12 +1726,15 @@ async function processGoogleNotification(work, config, store, purchaseStore) {
   }
 }
 async function handleGoogleWebhook(req, res, config, store, purchaseStore, webhookEventStore, webhookQueue) {
-  if (config.google?.pushAudience) {
-    const authenticated = await verifyGooglePushToken(
-      req,
-      config.google.pushAudience,
-      config.google.pushServiceAccountEmail
-    );
+  const pushIdentities = getAppRegistry(config).apps.map((app) => app.google).filter((g) => !!g?.pushAudience);
+  if (pushIdentities.length > 0) {
+    let authenticated = false;
+    for (const google of pushIdentities) {
+      if (await verifyGooglePushToken(req, google.pushAudience, google.pushServiceAccountEmail)) {
+        authenticated = true;
+        break;
+      }
+    }
     if (!authenticated) {
       sendError(res, 401, ONESUB_ERROR_CODE.UNAUTHORIZED, "Unauthorized");
       return;
@@ -1663,10 +1756,11 @@ async function handleGoogleWebhook(req, res, config, store, purchaseStore, webho
     markedEventId = body.message.messageId;
   }
   let work;
+  const { serves: servesPackage } = googleResolver(config);
   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);
+    if (!servesPackage(voided.packageName)) {
+      log.warn("[onesub/webhook/google] voided package name not served:", voided.packageName);
       sendError(res, 400, ONESUB_ERROR_CODE.PACKAGE_NAME_MISMATCH, "Package name mismatch");
       return;
     }
@@ -1674,8 +1768,8 @@ async function handleGoogleWebhook(req, res, config, store, purchaseStore, webho
   } else {
     const oneTimeProduct = decodeGoogleOneTimeProductNotification(body);
     if (oneTimeProduct) {
-      if (config.google?.packageName && oneTimeProduct.packageName !== config.google.packageName) {
-        log.warn("[onesub/webhook/google] oneTimeProduct package name mismatch:", oneTimeProduct.packageName, "!==", config.google.packageName);
+      if (!servesPackage(oneTimeProduct.packageName)) {
+        log.warn("[onesub/webhook/google] oneTimeProduct package name not served:", oneTimeProduct.packageName);
         sendError(res, 400, ONESUB_ERROR_CODE.PACKAGE_NAME_MISMATCH, "Package name mismatch");
         return;
       }
@@ -1686,8 +1780,8 @@ async function handleGoogleWebhook(req, res, config, store, purchaseStore, webho
         res.status(200).json({ received: true });
         return;
       }
-      if (config.google?.packageName && notification.packageName !== config.google.packageName) {
-        log.warn("[onesub/webhook/google] Package name mismatch:", notification.packageName, "!==", config.google.packageName);
+      if (!servesPackage(notification.packageName)) {
+        log.warn("[onesub/webhook/google] Package name not served:", notification.packageName);
         sendError(res, 400, ONESUB_ERROR_CODE.PACKAGE_NAME_MISMATCH, "Package name mismatch");
         return;
       }
@@ -1750,7 +1844,9 @@ var validatePurchaseSchema = z.object({
   receipt: z.string().min(1).max(1e4),
   userId: z.string().min(1).max(256),
   productId: z.string().min(1).max(256),
-  type: z.enum([PURCHASE_TYPE.CONSUMABLE, PURCHASE_TYPE.NON_CONSUMABLE])
+  type: z.enum([PURCHASE_TYPE.CONSUMABLE, PURCHASE_TYPE.NON_CONSUMABLE]),
+  /** Which app this receipt belongs to. Optional — see OneSubServerConfig.apps. */
+  appId: z.string().min(1).max(256).optional()
 });
 var purchaseStatusQuerySchema = z.object({
   userId: z.string().min(1).max(256),
@@ -1758,6 +1854,7 @@ var purchaseStatusQuerySchema = z.object({
 });
 function createPurchaseRouter(config, purchaseStore) {
   const router = Router();
+  const registry = getAppRegistry(config);
   router.post(ROUTES.VALIDATE_PURCHASE, async (req, res) => {
     let body;
     try {
@@ -1769,7 +1866,11 @@ function createPurchaseRouter(config, purchaseStore) {
       }
       throw err2;
     }
-    const { platform, receipt, userId, productId, type } = body;
+    const { platform, receipt, userId, productId, type, appId } = body;
+    const appConfig = registry.configFor({
+      appId,
+      bundleId: platform === "apple" ? peekAppleBundleId(receipt) : void 0
+    });
     try {
       if (type === PURCHASE_TYPE.NON_CONSUMABLE) {
         const owned = (await purchaseStore.getPurchasesByUserId(userId)).find(
@@ -1789,25 +1890,25 @@ function createPurchaseRouter(config, purchaseStore) {
       let purchasedAt = (/* @__PURE__ */ new Date()).toISOString();
       let boundAccountId = null;
       if (platform === "apple") {
-        if (!config.apple) {
+        if (!appConfig.apple) {
           sendError(res, 500, ONESUB_ERROR_CODE.APPLE_CONFIG_MISSING, "Apple configuration not provided", NO_PURCHASE);
           return;
         }
-        const result = await validateAppleConsumableReceipt(receipt, config.apple, productId);
+        const result = await validateAppleConsumableReceipt(receipt, appConfig.apple, productId);
         if (result) {
           transactionId = result.transactionId;
           purchasedAt = result.purchasedAt;
           boundAccountId = result.appAccountToken ?? null;
         }
       } else {
-        if (!config.google) {
+        if (!appConfig.google) {
           sendError(res, 500, ONESUB_ERROR_CODE.GOOGLE_CONFIG_MISSING, "Google configuration not provided", NO_PURCHASE);
           return;
         }
         const result = await validateGoogleProductReceipt(
           receipt,
           productId,
-          config.google,
+          appConfig.google,
           type === PURCHASE_TYPE.CONSUMABLE ? "consumable" : "non_consumable"
         );
         if (result) {
@@ -1873,11 +1974,11 @@ function createPurchaseRouter(config, purchaseStore) {
         quantity: 1
       };
       await purchaseStore.savePurchase(purchase);
-      if (platform === "google" && config.google) {
+      if (platform === "google" && appConfig.google) {
         if (type === PURCHASE_TYPE.CONSUMABLE) {
-          void consumeGoogleProductReceipt(receipt, productId, config.google);
+          void consumeGoogleProductReceipt(receipt, productId, appConfig.google);
         } else {
-          void acknowledgeGoogleProduct(receipt, productId, config.google);
+          void acknowledgeGoogleProduct(receipt, productId, appConfig.google);
         }
       }
       const response = {