@onesub/server 0.25.0 → 0.26.0

package/dist/__tests__/route-log-fields.test.d.ts

@@ -0,0 +1,20 @@
+/**
+ * What the routes, stores and webhook handlers put on a log line.
+ *
+ * This is the half of the migration that delivers the point of it. `userId` does not
+ * exist in the provider layer — it arrives in a request body — so "show me every
+ * rejection for this user" only became answerable when these call sites moved.
+ * `provider-log-fields.test.ts` covers Apple and Google; this covers the other 54.
+ *
+ * Driven through HTTP with supertest rather than by calling handlers, because two of
+ * the values under test (`userId`, `bundleId`) are attacker-supplied through the
+ * request and the escaping only matters on that path. `bundleId` in particular is
+ * read out of an **unverified** JWS by `peekAppleBundleId`, which makes
+ * `apps.ts`'s "No app configured" line the most attacker-reachable log site in the
+ * package.
+ *
+ * Exact-line assertions again, for the reason given in `provider-log-fields.test.ts`:
+ * a substring match cannot tell a field from a sentence that mentions the value.
+ */
+export {};
+//# sourceMappingURL=route-log-fields.test.d.ts.map

package/dist/__tests__/route-log-fields.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"route-log-fields.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/route-log-fields.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG"}

package/dist/apps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apps.d.ts","sourceRoot":"","sources":["../src/apps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAG1E;;;;;;;GAOG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,IAAI,EAAE,eAAe,EAAE,CAAC;IACjC,QAAQ,CAAC,UAAU,EAAE,eAAe,GAAG,SAAS,CAAC;IACjD;;;;OAIG;IACH,SAAS,CAAC,IAAI,EAAE,OAAO,GAAG,kBAAkB,CAAC;CAC9C;AAED,MAAM,WAAW,OAAO;IACtB,gEAAgE;IAChE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAClC,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACtC;AAQD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,kBAAkB,GAAG,WAAW,CAMtE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,kBAAkB,GAAG,WAAW,CA8DxE;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAUjE"}
+{"version":3,"file":"apps.d.ts","sourceRoot":"","sources":["../src/apps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAG1E;;;;;;;GAOG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,IAAI,EAAE,eAAe,EAAE,CAAC;IACjC,QAAQ,CAAC,UAAU,EAAE,eAAe,GAAG,SAAS,CAAC;IACjD;;;;OAIG;IACH,SAAS,CAAC,IAAI,EAAE,OAAO,GAAG,kBAAkB,CAAC;CAC9C;AAED,MAAM,WAAW,OAAO;IACtB,gEAAgE;IAChE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAClC,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACtC;AAQD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,kBAAkB,GAAG,WAAW,CAMtE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,kBAAkB,GAAG,WAAW,CAiExE;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAUjE"}

package/dist/index.cjs

@@ -449,7 +449,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) {
@@ -1501,7 +1501,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) {
@@ -1509,13 +1512,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;
@@ -1603,9 +1606,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,
@@ -1618,7 +1622,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 = shared.SUBSCRIPTION_STATUS.EXPIRED;
         sub.willRenew = false;
       }
@@ -1630,7 +1634,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, shared.ONESUB_ERROR_CODE.INTERNAL_ERROR, "Internal server error during receipt validation", NO_SUB);
     }
   });
@@ -1662,7 +1666,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, shared.ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error", NO_SUB2);
     }
   });
@@ -1770,7 +1774,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 });
       }
     })();
   }
@@ -1783,7 +1787,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;
   }
@@ -1793,7 +1797,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,
@@ -1811,20 +1818,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) {
@@ -1840,7 +1849,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, shared.ONESUB_ERROR_CODE.INVALID_SIGNED_PAYLOAD, "Invalid signedPayload");
     return;
   }
@@ -1848,7 +1857,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;
     }
@@ -1861,7 +1872,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, shared.ONESUB_ERROR_CODE.BUNDLE_ID_MISMATCH, "Bundle ID mismatch");
     return;
   }
@@ -1881,7 +1892,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, shared.ONESUB_ERROR_CODE.WEBHOOK_PROCESSING_FAILED, "Failed to update subscription");
     }
@@ -1891,7 +1905,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, shared.ONESUB_ERROR_CODE.WEBHOOK_PROCESSING_FAILED, "Failed to update subscription");
   }
@@ -1926,15 +1943,15 @@ 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"
   }
 };
@@ -1976,12 +1993,14 @@ async function processGoogleNotification(work, config, store, purchaseStore) {
         const updated = config.refundPolicy === "until_expiry" ? { ...existing2, willRenew: false } : { ...existing2, status: shared.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;
@@ -1989,15 +2008,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;
   }
@@ -2024,7 +2046,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 };
@@ -2053,7 +2075,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;
@@ -2061,7 +2087,9 @@ 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
+      });
     }
   }
 }
@@ -2089,7 +2117,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;
     }
@@ -2100,7 +2130,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, shared.ONESUB_ERROR_CODE.PACKAGE_NAME_MISMATCH, "Package name mismatch");
       return;
     }
@@ -2109,7 +2141,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, shared.ONESUB_ERROR_CODE.PACKAGE_NAME_MISMATCH, "Package name mismatch");
         return;
       }
@@ -2121,7 +2155,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, shared.ONESUB_ERROR_CODE.PACKAGE_NAME_MISMATCH, "Package name mismatch");
         return;
       }
@@ -2139,7 +2175,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, shared.ONESUB_ERROR_CODE.WEBHOOK_PROCESSING_FAILED, GOOGLE_FAILURE_MESSAGES[work.kind].message);
     }
@@ -2150,7 +2190,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, shared.ONESUB_ERROR_CODE.WEBHOOK_PROCESSING_FAILED, message);
   }
@@ -2262,9 +2302,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,
@@ -2281,9 +2322,11 @@ function createPurchaseRouter(config, purchaseStore) {
         if (existing.userId !== userId) {
           if (type === shared.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,
@@ -2327,7 +2370,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, shared.ONESUB_ERROR_CODE.INTERNAL_ERROR, "Internal server error during purchase validation", NO_PURCHASE);
     }
   });
@@ -2342,7 +2385,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, shared.ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error", { purchases: [] });
     }
   });
@@ -2407,7 +2450,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, shared.ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error");
     }
   });
@@ -2431,7 +2474,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, shared.ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error", { entitlements: {} });
     }
   });
@@ -2545,7 +2588,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, shared.ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error");
     }
   });
@@ -2565,7 +2608,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, shared.ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error");
     }
   });
@@ -2598,7 +2644,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, shared.ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error");
     }
   });
@@ -2628,7 +2674,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, shared.ONESUB_ERROR_CODE.INTERNAL_ERROR, "Internal server error");
     }
   });
@@ -2643,9 +2692,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(shared.ROUTES.ADMIN_TEST_OVERRIDE, (req, res) => {
@@ -2662,7 +2712,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, shared.ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error");
       }
     });
@@ -2676,7 +2726,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, shared.ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error");
       }
     });
@@ -2846,7 +2896,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, shared.ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error");
     }
   });
@@ -2913,7 +2963,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, shared.ONESUB_ERROR_CODE.STORE_ERROR, "Internal server error");
       }
     };
@@ -2985,7 +3035,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, shared.ONESUB_ERROR_CODE.INTERNAL_ERROR, "Offer signing failed");
     }
   });
@@ -3057,7 +3107,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;
 }
@@ -3798,7 +3848,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;
       })();
@@ -3822,13 +3872,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 });
       });
     }
   }