@solvapay/server 2.2.0 → 2.2.1-preview-7d806cc7af767dec26b099517bc6ededc85adf9a

package/dist/edge.js

@@ -3273,6 +3273,7 @@ async function checkPurchaseCore(request, options = {}) {
 }
 
 // src/helpers/usage.ts
+import { countsUsage } from "@solvapay/core";
 async function getUsageCore(request, options = {}) {
   const purchaseResult = await checkPurchaseCore(request, options);
   if (isErrorResult(purchaseResult)) return purchaseResult;
@@ -3292,8 +3293,8 @@ async function getUsageCore(request, options = {}) {
     ...usage?.periodStart ? { periodStart: usage.periodStart } : {},
     ...usage?.periodEnd ? { periodEnd: usage.periodEnd } : {}
   };
-  const isMetered = activePurchase.planSnapshot?.isMetered === true;
-  if (!isMetered || !activePurchase.productRef) {
+  const usageCounted = countsUsage(activePurchase.planSnapshot) || activePurchase.planSnapshot?.isMetered === true;
+  if (!usageCounted || !activePurchase.productRef) {
     return {
       meterRef: null,
       total: null,

package/dist/fetch/index.cjs

@@ -3050,6 +3050,7 @@ async function checkPurchaseCore(request, options = {}) {
 }
 
 // src/helpers/usage.ts
+var import_core10 = require("@solvapay/core");
 async function trackUsageCore(request, body, options = {}) {
   try {
     const userResult = await getAuthenticatedUserCore(request);
@@ -3078,7 +3079,7 @@ async function trackUsageCore(request, body, options = {}) {
 }
 
 // src/edge.ts
-var import_core10 = require("@solvapay/core");
+var import_core11 = require("@solvapay/core");
 function timingSafeEqual(a, b) {
   if (a.length !== b.length) return false;
   let mismatch = 0;
@@ -3093,22 +3094,22 @@ async function verifyWebhook({
   secret
 }) {
   const toleranceSec = 300;
-  if (!signature) throw new import_core10.SolvaPayError("Missing webhook signature");
+  if (!signature) throw new import_core11.SolvaPayError("Missing webhook signature");
   const parts = signature.split(",");
   const tPart = parts.find((p) => p.startsWith("t="));
   const v1Part = parts.find((p) => p.startsWith("v1="));
   if (!tPart || !v1Part) {
-    throw new import_core10.SolvaPayError("Malformed webhook signature");
+    throw new import_core11.SolvaPayError("Malformed webhook signature");
   }
   const timestamp = parseInt(tPart.slice(2), 10);
   const receivedHmac = v1Part.slice(3);
   if (Number.isNaN(timestamp) || !receivedHmac) {
-    throw new import_core10.SolvaPayError("Malformed webhook signature");
+    throw new import_core11.SolvaPayError("Malformed webhook signature");
   }
   if (toleranceSec > 0) {
     const age = Math.abs(Math.floor(Date.now() / 1e3) - timestamp);
     if (age > toleranceSec) {
-      throw new import_core10.SolvaPayError("Webhook signature timestamp too old");
+      throw new import_core11.SolvaPayError("Webhook signature timestamp too old");
     }
   }
   const enc = new TextEncoder();
@@ -3122,12 +3123,12 @@ async function verifyWebhook({
   const sigBuf = await crypto.subtle.sign("HMAC", key, enc.encode(`${timestamp}.${body}`));
   const expectedHmac = Array.from(new Uint8Array(sigBuf)).map((b) => b.toString(16).padStart(2, "0")).join("");
   if (!timingSafeEqual(expectedHmac, receivedHmac)) {
-    throw new import_core10.SolvaPayError("Invalid webhook signature");
+    throw new import_core11.SolvaPayError("Invalid webhook signature");
   }
   try {
     return JSON.parse(body);
   } catch {
-    throw new import_core10.SolvaPayError("Invalid webhook payload: body is not valid JSON");
+    throw new import_core11.SolvaPayError("Invalid webhook payload: body is not valid JSON");
   }
 }
 

package/dist/fetch/index.js

@@ -2999,6 +2999,7 @@ async function checkPurchaseCore(request, options = {}) {
 }
 
 // src/helpers/usage.ts
+import { countsUsage } from "@solvapay/core";
 async function trackUsageCore(request, body, options = {}) {
   try {
     const userResult = await getAuthenticatedUserCore(request);

package/dist/index.cjs

@@ -78,7 +78,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_node_crypto = __toESM(require("crypto"), 1);
-var import_core11 = require("@solvapay/core");
+var import_core12 = require("@solvapay/core");
 
 // src/client.ts
 var import_core = require("@solvapay/core");
@@ -3351,6 +3351,7 @@ async function checkPurchaseCore(request, options = {}) {
 }
 
 // src/helpers/usage.ts
+var import_core11 = require("@solvapay/core");
 async function getUsageCore(request, options = {}) {
   const purchaseResult = await checkPurchaseCore(request, options);
   if (isErrorResult(purchaseResult)) return purchaseResult;
@@ -3370,8 +3371,8 @@ async function getUsageCore(request, options = {}) {
     ...usage?.periodStart ? { periodStart: usage.periodStart } : {},
     ...usage?.periodEnd ? { periodEnd: usage.periodEnd } : {}
   };
-  const isMetered = activePurchase.planSnapshot?.isMetered === true;
-  if (!isMetered || !activePurchase.productRef) {
+  const usageCounted = (0, import_core11.countsUsage)(activePurchase.planSnapshot) || activePurchase.planSnapshot?.isMetered === true;
+  if (!usageCounted || !activePurchase.productRef) {
     return {
       meterRef: null,
       total: null,
@@ -3435,34 +3436,34 @@ function verifyWebhook({
   secret
 }) {
   const toleranceSec = 300;
-  if (!signature) throw new import_core11.SolvaPayError("Missing webhook signature");
+  if (!signature) throw new import_core12.SolvaPayError("Missing webhook signature");
   const parts = signature.split(",");
   const tPart = parts.find((p) => p.startsWith("t="));
   const v1Part = parts.find((p) => p.startsWith("v1="));
   if (!tPart || !v1Part) {
-    throw new import_core11.SolvaPayError("Malformed webhook signature");
+    throw new import_core12.SolvaPayError("Malformed webhook signature");
   }
   const timestamp = parseInt(tPart.slice(2), 10);
   const receivedHmac = v1Part.slice(3);
   if (Number.isNaN(timestamp) || !receivedHmac) {
-    throw new import_core11.SolvaPayError("Malformed webhook signature");
+    throw new import_core12.SolvaPayError("Malformed webhook signature");
   }
   if (toleranceSec > 0) {
     const age = Math.abs(Math.floor(Date.now() / 1e3) - timestamp);
     if (age > toleranceSec) {
-      throw new import_core11.SolvaPayError("Webhook signature timestamp too old");
+      throw new import_core12.SolvaPayError("Webhook signature timestamp too old");
     }
   }
   const expectedHmac = import_node_crypto.default.createHmac("sha256", secret).update(`${timestamp}.${body}`).digest("hex");
   if (receivedHmac.length !== expectedHmac.length) {
-    throw new import_core11.SolvaPayError("Invalid webhook signature");
+    throw new import_core12.SolvaPayError("Invalid webhook signature");
   }
   const ok = import_node_crypto.default.timingSafeEqual(Buffer.from(expectedHmac), Buffer.from(receivedHmac));
-  if (!ok) throw new import_core11.SolvaPayError("Invalid webhook signature");
+  if (!ok) throw new import_core12.SolvaPayError("Invalid webhook signature");
   try {
     return JSON.parse(body);
   } catch {
-    throw new import_core11.SolvaPayError("Invalid webhook payload: body is not valid JSON");
+    throw new import_core12.SolvaPayError("Invalid webhook payload: body is not valid JSON");
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/index.js

@@ -3275,6 +3275,7 @@ async function checkPurchaseCore(request, options = {}) {
 }
 
 // src/helpers/usage.ts
+import { countsUsage } from "@solvapay/core";
 async function getUsageCore(request, options = {}) {
   const purchaseResult = await checkPurchaseCore(request, options);
   if (isErrorResult(purchaseResult)) return purchaseResult;
@@ -3294,8 +3295,8 @@ async function getUsageCore(request, options = {}) {
     ...usage?.periodStart ? { periodStart: usage.periodStart } : {},
     ...usage?.periodEnd ? { periodEnd: usage.periodEnd } : {}
   };
-  const isMetered = activePurchase.planSnapshot?.isMetered === true;
-  if (!isMetered || !activePurchase.productRef) {
+  const usageCounted = countsUsage(activePurchase.planSnapshot) || activePurchase.planSnapshot?.isMetered === true;
+  if (!usageCounted || !activePurchase.productRef) {
     return {
       meterRef: null,
       total: null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solvapay/server",
-  "version": "2.2.0",
+  "version": "2.2.1-preview-7d806cc7af767dec26b099517bc6ededc85adf9a",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -42,7 +42,7 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@solvapay/core": "1.4.0"
+    "@solvapay/core": "1.5.0-preview-7d806cc7af767dec26b099517bc6ededc85adf9a"
   },
   "peerDependencies": {
     "zod": "^4.2.0",