@onesub/server 0.25.0 → 0.27.0

package/dist/index.js

@@ -167,6 +167,8 @@ var APPLE_ROOT_CA_PEMS = [APPLE_ROOT_CA_G3_PEM];
 var LOG_CONTINUATION = "\n    | ";
 var BARE_VALUE = /^[\w.:/@+-]+$/;
 var LINE_TERMINATORS = /\r\n|\r|\n|\u2028|\u2029/;
+var MAX_VALUE_CHARS = 512;
+var PLAY_TOKEN_IN_URL = /\/tokens\/[^/:"'\s\\]+/g;
 var MAX_CAUSE_DEPTH = 2;
 var MAX_AGGREGATE_ERRORS = 3;
 function esc(value) {
@@ -175,6 +177,13 @@ function esc(value) {
 function escQuoted(value) {
   return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\r/g, "\\r").replace(/\n/g, "\\n").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029");
 }
+function clamp(value) {
+  if (value.length <= MAX_VALUE_CHARS) return value;
+  return `${value.slice(0, MAX_VALUE_CHARS)}\u2026+${value.length - MAX_VALUE_CHARS} more`;
+}
+function sanitize(value) {
+  return clamp(value.replace(PLAY_TOKEN_IN_URL, "/tokens/[redacted]"));
+}
 function renderValue(value) {
   if (value === void 0) return void 0;
   if (value === null) return "null";
@@ -184,17 +193,19 @@ function renderValue(value) {
       return String(value);
     case "bigint":
       return `${value}n`;
-    case "string":
-      return BARE_VALUE.test(value) ? value : `"${escQuoted(value)}"`;
+    case "string": {
+      const safe = sanitize(value);
+      return BARE_VALUE.test(safe) ? safe : `"${escQuoted(safe)}"`;
+    }
     case "object":
       try {
-        return `"${escQuoted(JSON.stringify(value) ?? "null")}"`;
+        return `"${escQuoted(sanitize(JSON.stringify(value) ?? "null"))}"`;
       } catch {
         return '"[unserialisable]"';
       }
     default:
       try {
-        return `"${escQuoted(String(value))}"`;
+        return `"${escQuoted(sanitize(String(value)))}"`;
       } catch {
         return '"[unrenderable]"';
       }
@@ -442,7 +453,7 @@ function outcomePasses(outcome, tag) {
     throw new Error(`[onesub/mock/${tag}] simulated upstream network error`);
   }
   if (outcome.kind === "valid" || outcome.kind === "sandbox") return true;
-  log.warn(`[onesub/mock/${tag}] receipt rejected`, { outcome: outcome.kind });
+  log.warn("[onesub/mock] receipt rejected", { provider: tag, outcome: outcome.kind });
   return false;
 }
 function deterministicTransactionId(prefix, receipt) {
@@ -1494,7 +1505,10 @@ function buildAppRegistry(config) {
   // 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)");
+    log.info("[onesub] Multi-app mode", {
+      appIds: apps.map(appName),
+      defaultAppId: defaultApp ? appName(defaultApp) : null
+    });
   }
   function match(hint) {
     if (hint.appId) {
@@ -1502,13 +1516,13 @@ function buildAppRegistry(config) {
         (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);
+      log.warn("[onesub] Unknown appId", { 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);
+      log.warn("[onesub] No app configured for bundleId", { bundleId: hint.bundleId });
       return void 0;
     }
     return defaultApp;
@@ -1596,9 +1610,10 @@ function createValidateRouter(config, store) {
       delete sub.boundAccountId;
       const bindingMismatch = platform === "apple" ? boundAccountId && boundAccountId.toLowerCase() !== userId.toLowerCase() : boundAccountId && boundAccountId !== userId;
       if (bindingMismatch) {
-        log.warn(
-          `[onesub/validate] account binding mismatch for ${sub.originalTransactionId}: receipt token does not match userId ${userId}`
-        );
+        log.warn("[onesub/validate] account binding mismatch \u2014 receipt token does not match userId", {
+          originalTransactionId: sub.originalTransactionId,
+          userId
+        });
         sendError(
           res,
           409,
@@ -1611,7 +1626,7 @@ function createValidateRouter(config, store) {
       const isSandbox = sub.sandbox === true;
       delete sub.sandbox;
       if (isSandbox && getTestOverride(userId) === false) {
-        log.warn(`[onesub/validate] sandbox test override active for ${userId}: forcing not-entitled`);
+        log.warn("[onesub/validate] sandbox test override active \u2014 forcing not-entitled", { userId });
         sub.status = SUBSCRIPTION_STATUS.EXPIRED;
         sub.willRenew = false;
       }
@@ -1623,7 +1638,7 @@ function createValidateRouter(config, store) {
       const response = { valid: true, subscription: sub };
       res.status(200).json(response);
     } catch (err2) {
-      log.error("[onesub/validate] Unexpected error:", err2);
+      log.error("[onesub/validate] Unexpected error", { userId, productId, platform, err: err2 });
       sendError(res, 500, ONESUB_ERROR_CODE.INTERNAL_ERROR, "Internal server error during receipt validation", NO_SUB);
     }
   });
@@ -1655,7 +1670,7 @@ function createStatusRouter(store) {
       const response = { active, subscription: sub };
       res.status(200).json(response);
     } catch (err2) {
-      log.error("[onesub/status] Store error:", err2);
+      log.error("[onesub/status] Store error", { userId, err: err2 });
       sendError(res, 500, ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error", NO_SUB2);
     }
   });
@@ -1763,7 +1778,7 @@ async function processAppleNotification(work, config, store, purchaseStore) {
           });
         }
       } catch (err2) {
-        log.warn("[onesub/webhook/apple] consumptionInfoProvider failed:", err2);
+        log.warn("[onesub/webhook/apple] consumptionInfoProvider failed", { transactionId, err: err2 });
       }
     })();
   }
@@ -1776,7 +1791,7 @@ async function processAppleNotification(work, config, store, purchaseStore) {
     const lookupId = transactionId ?? originalTransactionId;
     const removed = await purchaseStore.deletePurchaseByTransactionId(lookupId);
     if (!removed) {
-      log.warn("[onesub/webhook/apple] IAP refund for unknown transaction:", lookupId);
+      log.warn("[onesub/webhook/apple] IAP refund for unknown transaction", { transactionId: lookupId });
     }
     return;
   }
@@ -1786,7 +1801,10 @@ async function processAppleNotification(work, config, store, purchaseStore) {
     const keepEntitlement = isSubscriptionRefund && config.refundPolicy === "until_expiry";
     const correctedUserId = appAccountToken && existing.userId === originalTransactionId ? appAccountToken : existing.userId;
     if (correctedUserId !== existing.userId) {
-      log.info("[onesub/webhook/apple] correcting userId from originalTransactionId to appAccountToken:", correctedUserId);
+      log.info("[onesub/webhook/apple] correcting userId from originalTransactionId to appAccountToken", {
+        originalTransactionId,
+        userId: correctedUserId
+      });
     }
     const updated = keepEntitlement ? { ...existing, userId: correctedUserId, willRenew: false } : {
       ...existing,
@@ -1804,20 +1822,22 @@ async function processAppleNotification(work, config, store, purchaseStore) {
       fresh.userId = appAccountToken ?? originalTransactionId;
       if (inAppOwnershipType === "FAMILY_SHARED") {
         const source = appAccountToken ? "appAccountToken" : "originalTransactionId (fallback)";
-        log.info(`[onesub/webhook/apple] FAMILY_SHARED \u2014 userId: ${fresh.userId} (source: ${source})`);
+        log.info("[onesub/webhook/apple] FAMILY_SHARED", {
+          originalTransactionId,
+          userId: fresh.userId,
+          userIdSource: source
+        });
       }
       await store.save(fresh);
     } else {
-      log.warn(
-        "[onesub/webhook/apple] Unknown transaction and Status API returned no record:",
+      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):",
+    log.warn("[onesub/webhook/apple] Received notification for unknown transaction (no API creds to recover)", {
       originalTransactionId
-    );
+    });
   }
 }
 async function handleAppleWebhook(req, res, config, store, purchaseStore, webhookEventStore, webhookQueue) {
@@ -1833,7 +1853,7 @@ async function handleAppleWebhook(req, res, config, store, purchaseStore, webhoo
       config.apple?.skipJwsVerification
     );
   } catch (err2) {
-    log.error("[onesub/webhook/apple] Failed to decode signedPayload:", err2);
+    log.error("[onesub/webhook/apple] Failed to decode signedPayload", { err: err2 });
     sendError(res, 400, ONESUB_ERROR_CODE.INVALID_SIGNED_PAYLOAD, "Invalid signedPayload");
     return;
   }
@@ -1841,7 +1861,9 @@ async function handleAppleWebhook(req, res, config, store, purchaseStore, webhoo
   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);
+      log.info("[onesub/webhook/apple] dedupe: already processed", {
+        notificationUUID: payload.notificationUUID
+      });
       res.status(200).json({ received: true, deduped: true });
       return;
     }
@@ -1854,7 +1876,7 @@ async function handleAppleWebhook(req, res, config, store, purchaseStore, webhoo
   }
   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);
+    log.warn("[onesub/webhook/apple] No app configured for bundleId", { bundleId: decoded.bundleId });
     sendError(res, 400, ONESUB_ERROR_CODE.BUNDLE_ID_MISMATCH, "Bundle ID mismatch");
     return;
   }
@@ -1874,7 +1896,10 @@ async function handleAppleWebhook(req, res, config, store, purchaseStore, webhoo
       });
       res.status(200).json({ received: true, queued: true });
     } catch (err2) {
-      log.error("[onesub/webhook/apple] Failed to enqueue webhook job:", err2);
+      log.error("[onesub/webhook/apple] Failed to enqueue webhook job", {
+        notificationUUID: payload.notificationUUID,
+        err: err2
+      });
       await unmarkWebhookEvent(webhookEventStore, "apple", markedEventId);
       sendError(res, 500, ONESUB_ERROR_CODE.WEBHOOK_PROCESSING_FAILED, "Failed to update subscription");
     }
@@ -1884,7 +1909,10 @@ async function handleAppleWebhook(req, res, config, store, purchaseStore, webhoo
     await processAppleNotification(work, config, store, purchaseStore);
     res.status(200).json({ received: true });
   } catch (err2) {
-    log.error("[onesub/webhook/apple] Store update error:", err2);
+    log.error("[onesub/webhook/apple] Store update error", {
+      notificationUUID: payload.notificationUUID,
+      err: err2
+    });
     await unmarkWebhookEvent(webhookEventStore, "apple", markedEventId);
     sendError(res, 500, ONESUB_ERROR_CODE.WEBHOOK_PROCESSING_FAILED, "Failed to update subscription");
   }
@@ -1919,30 +1947,41 @@ async function verifyGooglePushToken(req, expectedAudience, expectedServiceAccou
 }
 var GOOGLE_FAILURE_MESSAGES = {
   voided: {
-    logPrefix: "[onesub/webhook/google] voided notification error:",
+    logPrefix: "[onesub/webhook/google] voided notification error",
     message: "Failed to process voided notification"
   },
   oneTimeProduct: {
-    logPrefix: "[onesub/webhook/google] oneTimeProduct error:",
+    logPrefix: "[onesub/webhook/google] oneTimeProduct error",
     message: "Failed to process oneTimeProduct notification"
   },
   subscription: {
-    logPrefix: "[onesub/webhook/google] Error handling notification:",
+    logPrefix: "[onesub/webhook/google] Error handling notification",
     message: "Failed to process notification"
   }
 };
 function servesGoogle(config) {
   return getAppRegistry(config).apps.some((app) => !!app.google);
 }
+function googleWebhookIsAuthenticated(config) {
+  return getAppRegistry(config).apps.some((a) => a.google?.pushAudience);
+}
+function googleWebhookAllowsUnauthenticated(config) {
+  return getAppRegistry(config).apps.some((a) => a.google?.allowUnauthenticatedWebhook);
+}
 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.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 (!googleWebhookIsAuthenticated(config)) {
+    if (googleWebhookAllowsUnauthenticated(config)) {
+      log.warn(
+        "[onesub] SECURITY: POST /onesub/webhook/google runs unauthenticated by explicit opt-in \u2014 google.allowUnauthenticatedWebhook is set and no app sets google.pushAudience. Anything that can reach this endpoint can cancel a subscription or delete a one-time purchase, so the request must already be authenticated in front of this server."
+      );
+    } else {
+      log.warn(
+        "[onesub] POST /onesub/webhook/google will reject every request with 401 \u2014 no configured app sets google.pushAudience, so the Pub/Sub OIDC token cannot be verified. Set google.pushAudience (and google.pushServiceAccountEmail), or set google.allowUnauthenticatedWebhook when something in front of this server already authenticates the request."
+      );
+    }
   }
   if (!apps.some((a) => a.google?.packageName)) {
     log.warn(
@@ -1969,12 +2008,14 @@ async function processGoogleNotification(work, config, store, purchaseStore) {
         const updated = config.refundPolicy === "until_expiry" ? { ...existing2, willRenew: false } : { ...existing2, status: SUBSCRIPTION_STATUS.CANCELED };
         await store.save(updated);
       } else {
-        log.warn("[onesub/webhook/google] voided subscription for unknown purchaseToken:", voided.purchaseToken);
+        log.warn("[onesub/webhook/google] voided subscription for unknown purchaseToken", {
+          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);
+        log.warn("[onesub/webhook/google] voided IAP for unknown orderId", { orderId: voided.orderId });
       }
     }
     return;
@@ -1982,15 +2023,18 @@ async function processGoogleNotification(work, config, store, purchaseStore) {
   if (work.kind === "oneTimeProduct") {
     const { notificationType: notificationType2, purchaseToken: purchaseToken2, sku } = work.oneTimeProduct;
     if (notificationType2 === 1) {
-      log.info("[onesub/webhook/google] oneTimeProduct PURCHASED:", sku);
+      log.info("[onesub/webhook/google] oneTimeProduct PURCHASED", { productId: sku });
       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)
+          (err2) => log.warn("[onesub/webhook/google] oneTimeProduct ack failed \u2014 3-day auto-refund risk", {
+            productId: sku,
+            err: err2
+          })
         );
       }
     } else {
-      log.info("[onesub/webhook/google] oneTimeProduct CANCELED (pre-completion):", sku);
+      log.info("[onesub/webhook/google] oneTimeProduct CANCELED (pre-completion)", { productId: sku });
     }
     return;
   }
@@ -2017,7 +2061,7 @@ async function processGoogleNotification(work, config, store, purchaseStore) {
   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));
+    void Promise.resolve().then(() => hook({ purchaseToken, subscriptionId, packageName })).catch((err2) => log.warn("[onesub/webhook/google] onPriceChangeConfirmed hook failed", { err: err2 }));
   }
   if (existing) {
     let updated = { ...existing, status: finalStatus };
@@ -2046,7 +2090,11 @@ async function processGoogleNotification(work, config, store, purchaseStore) {
           const previous = await store.getByTransactionId(fresh.linkedPurchaseToken);
           fresh.userId = previous ? previous.userId : boundAccountId ?? purchaseToken;
           if (previous) {
-            log.info(`[onesub/webhook/google] inherited userId ${previous.userId} from linkedPurchaseToken ${fresh.linkedPurchaseToken} \u2192 new token ${purchaseToken}`);
+            log.info("[onesub/webhook/google] inherited userId from linkedPurchaseToken", {
+              userId: previous.userId,
+              linkedPurchaseToken: fresh.linkedPurchaseToken,
+              purchaseToken
+            });
           }
         } else {
           fresh.userId = boundAccountId ?? purchaseToken;
@@ -2054,13 +2102,20 @@ async function processGoogleNotification(work, config, store, purchaseStore) {
         await store.save(fresh);
       }
     } else {
-      log.warn("[onesub/webhook/google] Unknown purchase token and no serviceAccountKey to re-fetch:", purchaseToken);
+      log.warn("[onesub/webhook/google] Unknown purchase token and no serviceAccountKey to re-fetch", {
+        purchaseToken
+      });
     }
   }
 }
 async function handleGoogleWebhook(req, res, config, store, purchaseStore, webhookEventStore, webhookQueue) {
   const pushIdentities = getAppRegistry(config).apps.map((app) => app.google).filter((g) => !!g?.pushAudience);
-  if (pushIdentities.length > 0) {
+  if (pushIdentities.length === 0) {
+    if (process.env["NODE_ENV"] === "production" && !googleWebhookAllowsUnauthenticated(config)) {
+      sendError(res, 401, ONESUB_ERROR_CODE.UNAUTHORIZED, "Unauthorized");
+      return;
+    }
+  } else {
     let authenticated = false;
     for (const google of pushIdentities) {
       if (await verifyGooglePushToken(req, google.pushAudience, google.pushServiceAccountEmail)) {
@@ -2082,7 +2137,9 @@ async function handleGoogleWebhook(req, res, config, store, purchaseStore, webho
   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);
+      log.info("[onesub/webhook/google] dedupe: already processed", {
+        messageId: body.message.messageId
+      });
       res.status(200).json({ received: true, deduped: true });
       return;
     }
@@ -2093,7 +2150,9 @@ async function handleGoogleWebhook(req, res, config, store, purchaseStore, webho
   const voided = decodeGoogleVoidedNotification(body);
   if (voided) {
     if (!servesPackage(voided.packageName)) {
-      log.warn("[onesub/webhook/google] voided package name not served:", voided.packageName);
+      log.warn("[onesub/webhook/google] voided package name not served", {
+        packageName: voided.packageName
+      });
       sendError(res, 400, ONESUB_ERROR_CODE.PACKAGE_NAME_MISMATCH, "Package name mismatch");
       return;
     }
@@ -2102,7 +2161,9 @@ async function handleGoogleWebhook(req, res, config, store, purchaseStore, webho
     const oneTimeProduct = decodeGoogleOneTimeProductNotification(body);
     if (oneTimeProduct) {
       if (!servesPackage(oneTimeProduct.packageName)) {
-        log.warn("[onesub/webhook/google] oneTimeProduct package name not served:", oneTimeProduct.packageName);
+        log.warn("[onesub/webhook/google] oneTimeProduct package name not served", {
+          packageName: oneTimeProduct.packageName
+        });
         sendError(res, 400, ONESUB_ERROR_CODE.PACKAGE_NAME_MISMATCH, "Package name mismatch");
         return;
       }
@@ -2114,7 +2175,9 @@ async function handleGoogleWebhook(req, res, config, store, purchaseStore, webho
         return;
       }
       if (!servesPackage(notification.packageName)) {
-        log.warn("[onesub/webhook/google] Package name not served:", notification.packageName);
+        log.warn("[onesub/webhook/google] Package name not served", {
+          packageName: notification.packageName
+        });
         sendError(res, 400, ONESUB_ERROR_CODE.PACKAGE_NAME_MISMATCH, "Package name mismatch");
         return;
       }
@@ -2132,7 +2195,11 @@ async function handleGoogleWebhook(req, res, config, store, purchaseStore, webho
       });
       res.status(200).json({ received: true, queued: true });
     } catch (err2) {
-      log.error("[onesub/webhook/google] Failed to enqueue webhook job:", err2);
+      log.error("[onesub/webhook/google] Failed to enqueue webhook job", {
+        kind: work.kind,
+        messageId: body.message.messageId,
+        err: err2
+      });
       await unmarkWebhookEvent(webhookEventStore, "google", markedEventId);
       sendError(res, 500, ONESUB_ERROR_CODE.WEBHOOK_PROCESSING_FAILED, GOOGLE_FAILURE_MESSAGES[work.kind].message);
     }
@@ -2143,7 +2210,7 @@ async function handleGoogleWebhook(req, res, config, store, purchaseStore, webho
     res.status(200).json({ received: true });
   } catch (err2) {
     const { logPrefix, message } = GOOGLE_FAILURE_MESSAGES[work.kind];
-    log.error(logPrefix, err2);
+    log.error(logPrefix, { kind: work.kind, err: err2 });
     await unmarkWebhookEvent(webhookEventStore, "google", markedEventId);
     sendError(res, 500, ONESUB_ERROR_CODE.WEBHOOK_PROCESSING_FAILED, message);
   }
@@ -2255,9 +2322,10 @@ function createPurchaseRouter(config, purchaseStore) {
       }
       const bindingMismatch = platform === "apple" ? boundAccountId && boundAccountId.toLowerCase() !== userId.toLowerCase() : boundAccountId && boundAccountId !== userId;
       if (bindingMismatch) {
-        log.warn(
-          `[onesub/purchase] account binding mismatch for transaction ${transactionId}: token does not match userId ${userId}`
-        );
+        log.warn("[onesub/purchase] account binding mismatch \u2014 token does not match userId", {
+          transactionId,
+          userId
+        });
         sendError(
           res,
           409,
@@ -2274,9 +2342,11 @@ function createPurchaseRouter(config, purchaseStore) {
         if (existing.userId !== userId) {
           if (type === PURCHASE_TYPE.NON_CONSUMABLE) {
             await purchaseStore.reassignPurchase(transactionId, userId);
-            log.info(
-              `[onesub/purchase] reassigned transaction ${transactionId} from ${existing.userId} to ${userId}`
-            );
+            log.info("[onesub/purchase] reassigned transaction to a new user", {
+              transactionId,
+              fromUserId: existing.userId,
+              userId
+            });
           } else {
             sendError(
               res,
@@ -2320,7 +2390,7 @@ function createPurchaseRouter(config, purchaseStore) {
       };
       res.status(200).json(response);
     } catch (err2) {
-      log.error("[onesub/purchase/validate] Unexpected error:", err2);
+      log.error("[onesub/purchase/validate] Unexpected error", { userId, productId, platform, type, err: err2 });
       sendError(res, 500, ONESUB_ERROR_CODE.INTERNAL_ERROR, "Internal server error during purchase validation", NO_PURCHASE);
     }
   });
@@ -2335,7 +2405,7 @@ function createPurchaseRouter(config, purchaseStore) {
       const response = { purchases };
       res.status(200).json(response);
     } catch (err2) {
-      log.error("[onesub/purchase/status] Store error:", err2);
+      log.error("[onesub/purchase/status] Store error", { userId, productId, err: err2 });
       sendError(res, 500, ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error", { purchases: [] });
     }
   });
@@ -2400,7 +2470,7 @@ function createEntitlementRouter(config, store, purchaseStore) {
       const response = { id, ...status };
       res.status(200).json(response);
     } catch (err2) {
-      log.error("[onesub/entitlement] evaluation error:", err2);
+      log.error("[onesub/entitlement] evaluation error", { userId, entitlement: id, err: err2 });
       sendError(res, 500, ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error");
     }
   });
@@ -2424,7 +2494,7 @@ function createEntitlementRouter(config, store, purchaseStore) {
       };
       res.status(200).json(response);
     } catch (err2) {
-      log.error("[onesub/entitlements] evaluation error:", err2);
+      log.error("[onesub/entitlements] evaluation error", { userId, err: err2 });
       sendError(res, 500, ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error", { entitlements: {} });
     }
   });
@@ -2538,7 +2608,7 @@ function createAdminRouter(config, purchaseStore, store, webhookQueue) {
       };
       res.status(200).json(response);
     } catch (err2) {
-      log.error("[onesub/admin/subscriptions] list error:", err2);
+      log.error("[onesub/admin/subscriptions] list error", { err: err2 });
       sendError(res, 500, ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error");
     }
   });
@@ -2558,7 +2628,10 @@ function createAdminRouter(config, purchaseStore, store, webhookQueue) {
       }
       res.status(200).json(sub);
     } catch (err2) {
-      log.error("[onesub/admin/subscriptions/:transactionId] detail error:", err2);
+      log.error("[onesub/admin/subscriptions/:transactionId] detail error", {
+        transactionId: params.transactionId,
+        err: err2
+      });
       sendError(res, 500, ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error");
     }
   });
@@ -2591,7 +2664,7 @@ function createAdminRouter(config, purchaseStore, store, webhookQueue) {
       };
       res.status(200).json(response);
     } catch (err2) {
-      log.error("[onesub/admin/customers/:userId] error:", err2);
+      log.error("[onesub/admin/customers/:userId] error", { userId: params.userId, err: err2 });
       sendError(res, 500, ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error");
     }
   });
@@ -2621,7 +2694,10 @@ function createAdminRouter(config, purchaseStore, store, webhookQueue) {
       await store.save(fresh);
       res.status(200).json({ ok: true, subscription: fresh });
     } catch (err2) {
-      log.error("[onesub/admin/sync-apple] error:", err2);
+      log.error("[onesub/admin/sync-apple] error", {
+        originalTransactionId: params.originalTransactionId,
+        err: err2
+      });
       sendError(res, 500, ONESUB_ERROR_CODE.INTERNAL_ERROR, "Internal server error");
     }
   });
@@ -2636,9 +2712,10 @@ function createAdminRouter(config, purchaseStore, store, webhookQueue) {
     const body = parseOrSend(res, overrideBodySchema, req.body);
     if (!body) return;
     setTestOverride(params.userId, body.entitled);
-    log.warn(
-      `[onesub/admin] sandbox test override set for ${params.userId}: entitled=${body.entitled}`
-    );
+    log.warn("[onesub/admin] sandbox test override set", {
+      userId: params.userId,
+      entitled: body.entitled
+    });
     res.json({ ok: true, userId: params.userId, entitled: body.entitled, sandboxOnly: true });
   });
   router.delete(ROUTES.ADMIN_TEST_OVERRIDE, (req, res) => {
@@ -2655,7 +2732,7 @@ function createAdminRouter(config, purchaseStore, store, webhookQueue) {
         const items = await webhookQueue.listDeadLetters();
         res.status(200).json({ items });
       } catch (err2) {
-        log.error("[onesub/admin/webhook-deadletters] error:", err2);
+        log.error("[onesub/admin/webhook-deadletters] error", { err: err2 });
         sendError(res, 500, ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error");
       }
     });
@@ -2669,7 +2746,7 @@ function createAdminRouter(config, purchaseStore, store, webhookQueue) {
         await webhookQueue.replayDeadLetter(params.id);
         res.status(200).json({ ok: true });
       } catch (err2) {
-        log.error("[onesub/admin/webhook-replay] error:", err2);
+        log.error("[onesub/admin/webhook-replay] error", { deadLetterId: params.id, err: err2 });
         sendError(res, 500, ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error");
       }
     });
@@ -2839,7 +2916,7 @@ function createMetricsRouter(config, store, purchaseStore) {
       );
       res.status(200).json(response);
     } catch (err2) {
-      log.error("[onesub/metrics/active] error:", err2);
+      log.error("[onesub/metrics/active] error", { err: err2 });
       sendError(res, 500, ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error");
     }
   });
@@ -2906,7 +2983,7 @@ function createMetricsRouter(config, store, purchaseStore) {
         };
         res.status(200).json(response);
       } catch (err2) {
-        log.error(`[onesub/metrics/${name}] error:`, err2);
+        log.error("[onesub/metrics] error", { route: name, err: err2 });
         sendError(res, 500, ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error");
       }
     };
@@ -2978,7 +3055,7 @@ function createAppleOfferRouter(config) {
       );
       res.status(200).json(result);
     } catch (err2) {
-      log.error("[onesub/apple/offer] signing error:", err2);
+      log.error("[onesub/apple/offer] signing error", { productId: body.productId, err: err2 });
       sendError(res, 500, ONESUB_ERROR_CODE.INTERNAL_ERROR, "Offer signing failed");
     }
   });
@@ -3050,7 +3127,7 @@ async function createPgPool(connectionString, label) {
   const Pool = pg.default?.Pool ?? pg.Pool;
   const pool = new Pool({ connectionString, max: 10 });
   pool.on("error", (err2) => {
-    log.error(`[onesub] ${label} pool error (idle client):`, err2);
+    log.error("[onesub] Postgres pool error (idle client)", { store: label, err: err2 });
   });
   return pool;
 }
@@ -3791,7 +3868,7 @@ var BullMQWebhookQueue = class {
         const { Queue } = await this.getBullMQ();
         const queue = new Queue(this.queueName, { connection: this.connection });
         queue.on?.("error", (err2) => {
-          log.error("[onesub] BullMQ queue error:", err2);
+          log.error("[onesub] BullMQ queue error", { err: err2 });
         });
         return queue;
       })();
@@ -3815,13 +3892,13 @@ var BullMQWebhookQueue = class {
           }
         );
         worker.on?.("error", (err2) => {
-          log.error("[onesub] BullMQ worker error:", err2);
+          log.error("[onesub] BullMQ worker error", { err: err2 });
         });
         return worker;
       })();
       this.workerPromise.catch((err2) => {
         this.workerStartupError = err2 instanceof Error ? err2 : new Error(String(err2));
-        log.error("[onesub] BullMQ worker failed to start:", err2);
+        log.error("[onesub] BullMQ worker failed to start", { err: err2 });
       });
     }
   }