@onesub/server 0.24.0 → 0.25.0

package/dist/index.js

@@ -617,22 +617,23 @@ async function validateAppleReceipt(receipt, config) {
   } catch (err2) {
     const preview = receipt.slice(0, 60);
     const parts = receipt.split(".").length;
-    log.warn(
-      "[onesub/apple] Failed to decode receipt as JWS:",
-      err2?.message ?? err2,
-      `| preview: "${preview}..." (len=${receipt.length}, parts=${parts})`
-    );
+    log.warn("[onesub/apple] Failed to decode receipt as JWS", {
+      receiptPreview: preview,
+      receiptLength: receipt.length,
+      jwsParts: parts,
+      err: err2
+    });
     return null;
   }
   if (!tx.originalTransactionId || !tx.productId || !tx.expiresDate) {
     return null;
   }
   if (!tx.bundleId || tx.bundleId !== config.bundleId) {
-    log.warn("[onesub/apple] Bundle ID mismatch:", tx.bundleId, "!==", config.bundleId);
+    log.warn("[onesub/apple] Bundle ID mismatch", { bundleId: tx.bundleId, expected: config.bundleId });
     return null;
   }
   if (process.env["NODE_ENV"] === "production" && tx.environment !== "Production" && process.env["ONESUB_ALLOW_SANDBOX"] !== "true") {
-    log.warn("[onesub/apple] Sandbox receipt rejected in production:", tx.environment);
+    log.warn("[onesub/apple] Sandbox receipt rejected in production", { environment: tx.environment });
     return null;
   }
   const status = deriveStatus(tx, null);
@@ -672,23 +673,25 @@ async function validateAppleConsumableReceipt(signedTransaction, config, expecte
     const preview = signedTransaction.slice(0, 60);
     const parts = signedTransaction.split(".").length;
     const looksLikeJws = parts === 3;
-    log.warn(
-      "[onesub/apple] Failed to decode consumable JWS:",
-      err2?.message ?? err2,
-      `| receipt preview: "${preview}..." (len=${signedTransaction.length}, parts=${parts}, looksLikeJws=${looksLikeJws})`
-    );
+    log.warn("[onesub/apple] Failed to decode consumable JWS", {
+      receiptPreview: preview,
+      receiptLength: signedTransaction.length,
+      jwsParts: parts,
+      looksLikeJws,
+      err: err2
+    });
     return null;
   }
   if (!tx.bundleId || tx.bundleId !== config.bundleId) {
-    log.warn("[onesub/apple] Bundle ID mismatch:", tx.bundleId, "!==", config.bundleId);
+    log.warn("[onesub/apple] Bundle ID mismatch", { bundleId: tx.bundleId, expected: config.bundleId });
     return null;
   }
   if (tx.type !== "Consumable" && tx.type !== "Non-Consumable") {
-    log.warn("[onesub/apple] Invalid purchase type for product validation:", tx.type);
+    log.warn("[onesub/apple] Invalid purchase type for product validation", { type: tx.type });
     return null;
   }
   if (process.env["NODE_ENV"] === "production" && tx.environment !== "Production" && process.env["ONESUB_ALLOW_SANDBOX"] !== "true") {
-    log.warn("[onesub/apple] Sandbox receipt rejected in production:", tx.environment);
+    log.warn("[onesub/apple] Sandbox receipt rejected in production", { environment: tx.environment });
     return null;
   }
   if (!tx.productId) {
@@ -696,21 +699,28 @@ async function validateAppleConsumableReceipt(signedTransaction, config, expecte
     return null;
   }
   if (expectedProductId && tx.productId !== expectedProductId) {
-    log.warn("[onesub/apple] Product ID mismatch:", tx.productId, "!==", expectedProductId);
+    log.warn("[onesub/apple] Product ID mismatch", { productId: tx.productId, expected: expectedProductId });
     return null;
   }
   if (tx.revocationDate) {
-    log.warn("[onesub/apple] Purchase was revoked/refunded");
+    log.warn("[onesub/apple] Purchase was revoked/refunded", {
+      productId: tx.productId,
+      transactionId: tx.transactionId
+    });
     return null;
   }
   const maxAgeMs = (config.productReceiptMaxAgeHours ?? 72) * 60 * 60 * 1e3;
   if (tx.purchaseDate && Date.now() - tx.purchaseDate > maxAgeMs) {
-    log.warn(`[onesub/apple] Consumable receipt too old (>${config.productReceiptMaxAgeHours ?? 72}h)`);
+    log.warn("[onesub/apple] Consumable receipt too old", {
+      productId: tx.productId,
+      maxAgeHours: config.productReceiptMaxAgeHours ?? 72,
+      purchaseDate: new Date(tx.purchaseDate).toISOString()
+    });
     return null;
   }
   const transactionId = tx.transactionId ?? tx.originalTransactionId;
   if (!transactionId) {
-    log.warn("[onesub/apple] No transactionId in consumable transaction");
+    log.warn("[onesub/apple] No transactionId in consumable transaction", { productId: tx.productId });
     return null;
   }
   return {
@@ -789,7 +799,7 @@ async function sendAppleConsumptionResponse(transactionId, body, config, options
   try {
     jwt = await makeAppleApiJwt(config);
   } catch (err2) {
-    log.warn("[onesub/apple] Cannot send consumption response \u2014 JWT mint failed:", err2);
+    log.warn("[onesub/apple] Cannot send consumption response \u2014 JWT mint failed", { transactionId, err: err2 });
     return;
   }
   const host = options?.sandbox ? "api.storekit-sandbox.itunes.apple.com" : "api.storekit.itunes.apple.com";
@@ -805,10 +815,14 @@ async function sendAppleConsumptionResponse(transactionId, body, config, options
     });
     if (!resp.ok) {
       const text = await resp.text();
-      log.warn(`[onesub/apple] Consumption response API error ${resp.status}: ${text}`);
+      log.warn("[onesub/apple] Consumption response API error", {
+        httpStatus: resp.status,
+        transactionId,
+        responseBody: text
+      });
     }
   } catch (err2) {
-    log.warn("[onesub/apple] Consumption response network error:", err2);
+    log.warn("[onesub/apple] Consumption response network error", { transactionId, err: err2 });
   }
 }
 var APPLE_SUBSCRIPTION_STATUS_CODE = {
@@ -839,7 +853,10 @@ async function fetchAppleSubscriptionStatus(originalTransactionId, config, optio
   try {
     jwt = await makeAppleApiJwt(config);
   } catch (err2) {
-    log.warn("[onesub/apple] Cannot fetch subscription status \u2014 JWT mint failed:", err2);
+    log.warn("[onesub/apple] Cannot fetch subscription status \u2014 JWT mint failed", {
+      originalTransactionId,
+      err: err2
+    });
     return null;
   }
   const host = options?.sandbox ? "api.storekit-sandbox.itunes.apple.com" : "api.storekit.itunes.apple.com";
@@ -851,24 +868,31 @@ async function fetchAppleSubscriptionStatus(originalTransactionId, config, optio
     });
     if (!resp.ok) {
       const text = await resp.text();
-      log.warn(`[onesub/apple] Status API error ${resp.status}: ${text}`);
+      log.warn("[onesub/apple] Status API error", {
+        httpStatus: resp.status,
+        originalTransactionId,
+        responseBody: text
+      });
       return null;
     }
     body = await resp.json();
   } catch (err2) {
-    log.warn("[onesub/apple] Status API network error:", err2);
+    log.warn("[onesub/apple] Status API network error", { originalTransactionId, err: err2 });
     return null;
   }
   const entry = body.data?.flatMap((g) => g.lastTransactions ?? []).find((t) => t.originalTransactionId === originalTransactionId);
   if (!entry || entry.status == null || !entry.signedTransactionInfo) {
-    log.warn("[onesub/apple] Status API returned no matching transaction for", originalTransactionId);
+    log.warn("[onesub/apple] Status API returned no matching transaction", { originalTransactionId });
     return null;
   }
   let tx;
   try {
     tx = await decodeJws(entry.signedTransactionInfo, config.skipJwsVerification);
   } catch (err2) {
-    log.warn("[onesub/apple] Failed to decode signedTransactionInfo from Status API:", err2);
+    log.warn("[onesub/apple] Failed to decode signedTransactionInfo from Status API", {
+      originalTransactionId,
+      err: err2
+    });
     return null;
   }
   let renewal = null;
@@ -879,7 +903,10 @@ async function fetchAppleSubscriptionStatus(originalTransactionId, config, optio
     }
   }
   if (!tx.productId || !tx.expiresDate) {
-    log.warn("[onesub/apple] Status API transaction missing productId or expiresDate");
+    log.warn("[onesub/apple] Status API transaction missing productId or expiresDate", {
+      originalTransactionId,
+      productId: tx.productId
+    });
     return null;
   }
   const status = mapAppleStatusCode(entry.status);
@@ -903,7 +930,10 @@ async function fetchAppleTransactionHistory(originalTransactionId, config, optio
   try {
     jwt = await makeAppleApiJwt(config);
   } catch (err2) {
-    log.warn("[onesub/apple] Cannot fetch transaction history \u2014 JWT mint failed:", err2);
+    log.warn("[onesub/apple] Cannot fetch transaction history \u2014 JWT mint failed", {
+      originalTransactionId,
+      err: err2
+    });
     return null;
   }
   const host = options?.sandbox ? "api.storekit-sandbox.itunes.apple.com" : "api.storekit.itunes.apple.com";
@@ -920,12 +950,16 @@ async function fetchAppleTransactionHistory(originalTransactionId, config, optio
       });
       if (!resp.ok) {
         const text = await resp.text();
-        log.warn(`[onesub/apple] Transaction History API error ${resp.status}: ${text}`);
+        log.warn("[onesub/apple] Transaction History API error", {
+          httpStatus: resp.status,
+          originalTransactionId,
+          responseBody: text
+        });
         return null;
       }
       page = await resp.json();
     } catch (err2) {
-      log.warn("[onesub/apple] Transaction History API network error:", err2);
+      log.warn("[onesub/apple] Transaction History API network error", { originalTransactionId, err: err2 });
       return null;
     }
     for (const signed of page.signedTransactions ?? []) {
@@ -950,14 +984,16 @@ async function fetchAppleTransactionHistory(originalTransactionId, config, optio
     if (!page.hasMore) break;
     if (!page.revision || page.revision === revision) {
       log.warn(
-        "[onesub/apple] Transaction History API returned hasMore without a new revision cursor \u2014 stopping pagination (partial history returned)"
+        "[onesub/apple] Transaction History API returned hasMore without a new revision cursor \u2014 stopping pagination (partial history returned)",
+        { originalTransactionId, pageCount }
       );
       break;
     }
     if (pageCount >= MAX_HISTORY_PAGES) {
-      log.warn(
-        `[onesub/apple] Transaction History pagination hit the ${MAX_HISTORY_PAGES}-page cap \u2014 stopping (partial history returned)`
-      );
+      log.warn("[onesub/apple] Transaction History pagination hit the page cap \u2014 stopping (partial history returned)", {
+        originalTransactionId,
+        maxPages: MAX_HISTORY_PAGES
+      });
       break;
     }
     revision = page.revision;
@@ -1107,7 +1143,7 @@ async function acknowledgeGoogleSubscription(purchaseToken, productId, config) {
   try {
     accessToken = await getCachedAccessToken(config.serviceAccountKey);
   } catch (err2) {
-    log.warn("[onesub/google] Could not get access token for subscription ack:", err2);
+    log.warn("[onesub/google] Could not get access token for subscription ack", { productId, err: err2 });
     return;
   }
   const url = `https://androidpublisher.googleapis.com/androidpublisher/v3/applications/${encodeURIComponent(config.packageName)}/purchases/subscriptions/${encodeURIComponent(productId)}/tokens/${encodeURIComponent(purchaseToken)}:acknowledge`;
@@ -1119,10 +1155,14 @@ async function acknowledgeGoogleSubscription(purchaseToken, productId, config) {
     });
     if (!resp.ok) {
       const body = await resp.text();
-      log.warn(`[onesub/google] Subscription acknowledge API error ${resp.status}: ${body} \u2014 auto-refund risk`);
+      log.warn("[onesub/google] Subscription acknowledge API error \u2014 auto-refund risk", {
+        httpStatus: resp.status,
+        productId,
+        responseBody: body
+      });
     }
   } catch (err2) {
-    log.warn("[onesub/google] Subscription acknowledge network error \u2014 auto-refund risk:", err2);
+    log.warn("[onesub/google] Subscription acknowledge network error \u2014 auto-refund risk", { productId, err: err2 });
   }
 }
 async function acknowledgeGoogleProduct(purchaseToken, productId, config) {
@@ -1133,7 +1173,7 @@ async function acknowledgeGoogleProduct(purchaseToken, productId, config) {
   try {
     accessToken = await getCachedAccessToken(config.serviceAccountKey);
   } catch (err2) {
-    log.warn("[onesub/google] Could not get access token for product ack:", err2);
+    log.warn("[onesub/google] Could not get access token for product ack", { productId, err: err2 });
     return;
   }
   const url = `https://androidpublisher.googleapis.com/androidpublisher/v3/applications/${encodeURIComponent(config.packageName)}/purchases/products/${encodeURIComponent(productId)}/tokens/${encodeURIComponent(purchaseToken)}:acknowledge`;
@@ -1145,10 +1185,14 @@ async function acknowledgeGoogleProduct(purchaseToken, productId, config) {
     });
     if (!resp.ok) {
       const body = await resp.text();
-      log.warn(`[onesub/google] Product acknowledge API error ${resp.status}: ${body} \u2014 auto-refund risk`);
+      log.warn("[onesub/google] Product acknowledge API error \u2014 auto-refund risk", {
+        httpStatus: resp.status,
+        productId,
+        responseBody: body
+      });
     }
   } catch (err2) {
-    log.warn("[onesub/google] Product acknowledge network error \u2014 auto-refund risk:", err2);
+    log.warn("[onesub/google] Product acknowledge network error \u2014 auto-refund risk", { productId, err: err2 });
   }
 }
 async function consumeGoogleProductReceipt(purchaseToken, productId, config) {
@@ -1158,7 +1202,7 @@ async function consumeGoogleProductReceipt(purchaseToken, productId, config) {
   try {
     accessToken = await getCachedAccessToken(config.serviceAccountKey);
   } catch (err2) {
-    log.warn("[onesub/google] Could not get access token for consume:", err2);
+    log.warn("[onesub/google] Could not get access token for consume", { productId, err: err2 });
     return;
   }
   const url = `https://androidpublisher.googleapis.com/androidpublisher/v3/applications/${encodeURIComponent(config.packageName)}/purchases/products/${encodeURIComponent(productId)}/tokens/${encodeURIComponent(purchaseToken)}:consume`;
@@ -1169,10 +1213,14 @@ async function consumeGoogleProductReceipt(purchaseToken, productId, config) {
     });
     if (!resp.ok) {
       const body = await resp.text();
-      log.warn(`[onesub/google] Consume API error ${resp.status}: ${body} \u2014 auto-refund risk`);
+      log.warn("[onesub/google] Consume API error \u2014 auto-refund risk", {
+        httpStatus: resp.status,
+        productId,
+        responseBody: body
+      });
     }
   } catch (err2) {
-    log.warn("[onesub/google] Consume network error \u2014 auto-refund risk:", err2);
+    log.warn("[onesub/google] Consume network error \u2014 auto-refund risk", { productId, err: err2 });
   }
 }
 function deriveStatusV2(state) {
@@ -1198,11 +1246,11 @@ function deriveStatusV2(state) {
 async function validateGoogleReceipt(receipt, productId, config) {
   if (config.mockMode) return mockValidateGoogleSubscription(receipt, productId);
   if (!config.serviceAccountKey) {
-    log.warn("[onesub/google] No serviceAccountKey provided \u2014 cannot call Play API");
+    log.warn("[onesub/google] No serviceAccountKey provided \u2014 cannot call Play API", { productId });
     return null;
   }
   if (!config.packageName) {
-    log.warn("[onesub/google] No packageName provided \u2014 cannot call Play API");
+    log.warn("[onesub/google] No packageName provided \u2014 cannot call Play API", { productId });
     return null;
   }
   let purchase;
@@ -1210,25 +1258,27 @@ async function validateGoogleReceipt(receipt, productId, config) {
     const token = await getCachedAccessToken(config.serviceAccountKey);
     purchase = await fetchSubscriptionPurchaseV2(config.packageName, receipt, token);
   } catch (err2) {
-    log.error("[onesub/google] Receipt validation failed:", err2);
+    log.error("[onesub/google] Receipt validation failed", {
+      productId,
+      packageName: config.packageName,
+      err: err2
+    });
     return null;
   }
   const status = deriveStatusV2(purchase.subscriptionState);
   if (!status) {
-    log.warn(
-      "[onesub/google] Unrecognised or pending subscriptionState \u2014 rejecting:",
-      purchase.subscriptionState
-    );
+    log.warn("[onesub/google] Unrecognised or pending subscriptionState \u2014 rejecting", {
+      productId,
+      subscriptionState: purchase.subscriptionState
+    });
     return null;
   }
   const lineItem = purchase.lineItems?.find((item) => item.productId === productId);
   if (!lineItem) {
-    log.warn(
-      "[onesub/google] productId not found in subscription lineItems:",
+    log.warn("[onesub/google] productId not found in subscription lineItems", {
       productId,
-      "available:",
-      purchase.lineItems?.map((i) => i.productId).join(", ") ?? "(none)"
-    );
+      availableProductIds: purchase.lineItems?.map((i) => i.productId) ?? []
+    });
     return null;
   }
   const expiresAt = lineItem.expiryTime ?? (/* @__PURE__ */ new Date()).toISOString();
@@ -1260,11 +1310,11 @@ async function validateGoogleReceipt(receipt, productId, config) {
 async function validateGoogleProductReceipt(purchaseToken, productId, config, type = "non_consumable") {
   if (config.mockMode) return mockValidateGoogleProduct(purchaseToken, productId);
   if (!config.serviceAccountKey) {
-    log.warn("[onesub/google] No serviceAccountKey \u2014 cannot validate product receipt");
+    log.warn("[onesub/google] No serviceAccountKey \u2014 cannot validate product receipt", { productId });
     return null;
   }
   if (!config.packageName) {
-    log.warn("[onesub/google] No packageName \u2014 cannot validate product receipt");
+    log.warn("[onesub/google] No packageName \u2014 cannot validate product receipt", { productId });
     return null;
   }
   let purchase;
@@ -1272,27 +1322,44 @@ async function validateGoogleProductReceipt(purchaseToken, productId, config, ty
     const token = await getCachedAccessToken(config.serviceAccountKey);
     purchase = await fetchProductPurchase(config.packageName, productId, purchaseToken, token);
   } catch (err2) {
-    log.error("[onesub/google] Product receipt validation failed:", err2);
+    log.error("[onesub/google] Product receipt validation failed", {
+      productId,
+      packageName: config.packageName,
+      type,
+      err: err2
+    });
     return null;
   }
   if (purchase.purchaseState !== 0) {
-    log.warn("[onesub/google] Purchase not completed, state:", purchase.purchaseState);
+    log.warn("[onesub/google] Purchase not completed", {
+      productId,
+      purchaseState: purchase.purchaseState,
+      orderId: purchase.orderId
+    });
     return null;
   }
   if (type === "consumable" && purchase.consumptionState === 1) {
-    log.warn("[onesub/google] Consumable already consumed \u2014 possible replay attack");
+    log.warn("[onesub/google] Consumable already consumed \u2014 possible replay attack", {
+      productId,
+      orderId: purchase.orderId
+    });
     return null;
   }
   if (purchase.purchaseTimeMillis) {
     const purchaseTime = parseInt(purchase.purchaseTimeMillis, 10);
     const maxAgeMs = (config.productReceiptMaxAgeHours ?? 72) * 60 * 60 * 1e3;
     if (Date.now() - purchaseTime > maxAgeMs) {
-      log.warn(`[onesub/google] Product receipt too old (>${config.productReceiptMaxAgeHours ?? 72}h)`);
+      log.warn("[onesub/google] Product receipt too old", {
+        productId,
+        orderId: purchase.orderId,
+        maxAgeHours: config.productReceiptMaxAgeHours ?? 72,
+        purchaseDate: new Date(purchaseTime).toISOString()
+      });
       return null;
     }
   }
   if (!purchase.orderId) {
-    log.warn("[onesub/google] No orderId in product purchase");
+    log.warn("[onesub/google] No orderId in product purchase", { productId });
     return null;
   }
   return {
@@ -1349,7 +1416,11 @@ function decodeGoogleOneTimeProductNotification(payload) {
   if (!notification.oneTimeProductNotification) return null;
   const { notificationType, purchaseToken, sku } = notification.oneTimeProductNotification;
   if (notificationType !== 1 && notificationType !== 2) {
-    log.warn("[onesub/google] Unknown oneTimeProductNotification type:", notificationType);
+    log.warn("[onesub/google] Unknown oneTimeProductNotification type", {
+      notificationType,
+      productId: sku,
+      packageName: notification.packageName
+    });
     return null;
   }
   return { notificationType, purchaseToken, sku, packageName: notification.packageName };