@solvapay/next 1.0.7 → 1.0.9-preview.1

package/dist/index.cjs

@@ -53,7 +53,6 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 var import_server20 = require("next/server");
 var import_server21 = require("@solvapay/server");
-var import_core = require("@solvapay/core");
 
 // src/cache.ts
 function createRequestDeduplicator(options = {}) {
@@ -381,37 +380,14 @@ async function listPlans(request) {
 var import_server17 = require("next/server");
 var import_server18 = require("@solvapay/server");
 async function trackUsage(request, body, options = {}) {
-  try {
-    const userResult = await (0, import_server18.getAuthenticatedUserCore)(request);
-    if ((0, import_server18.isErrorResult)(userResult)) {
-      return import_server17.NextResponse.json(
-        { error: userResult.error, details: userResult.details },
-        { status: userResult.status }
-      );
-    }
-    const { userId, email, name } = userResult;
-    const solvaPay = options.solvaPay || (0, import_server18.createSolvaPay)();
-    const customerRef = await solvaPay.ensureCustomer(userId, userId, {
-      email: email || void 0,
-      name: name || void 0
-    });
-    await solvaPay.trackUsage({
-      customerRef,
-      actionType: body.actionType,
-      units: body.units,
-      productRef: body.productRef,
-      description: body.description,
-      metadata: body.metadata
-    });
-    return import_server17.NextResponse.json({ success: true });
-  } catch (error) {
-    console.error("[trackUsage] Error:", error);
-    const message = error instanceof Error ? error.message : "Unknown error";
+  const result = await (0, import_server18.trackUsageCore)(request, body, options);
+  if ((0, import_server18.isErrorResult)(result)) {
     return import_server17.NextResponse.json(
-      { error: "Track usage failed", details: message },
-      { status: 500 }
+      { error: result.error, details: result.details },
+      { status: result.status }
     );
   }
+  return import_server17.NextResponse.json(result);
 }
 
 // src/helpers/middleware.ts
@@ -486,8 +462,9 @@ function createSupabaseAuthMiddleware(options = {}) {
 
 // src/index.ts
 async function checkPurchase(request, options = {}) {
+  const deduplicator = getSharedDeduplicator(options.deduplication);
   try {
-    const { requireUserId, getUserEmailFromRequest, getUserNameFromRequest } = await import("@solvapay/auth");
+    const { requireUserId } = await import("@solvapay/auth");
     const userIdOrError = requireUserId(request);
     if (userIdOrError instanceof Response) {
       const clonedResponse = userIdOrError.clone();
@@ -495,61 +472,25 @@ async function checkPurchase(request, options = {}) {
       return import_server20.NextResponse.json(body, { status: userIdOrError.status });
     }
     const userId = userIdOrError;
-    const email = options.includeEmail !== false ? await getUserEmailFromRequest(request) : null;
-    const name = options.includeName !== false ? await getUserNameFromRequest(request) : null;
-    const cachedCustomerRef = request.headers.get("x-solvapay-customer-ref");
-    const solvaPay = options.solvaPay || (0, import_server21.createSolvaPay)();
-    if (cachedCustomerRef) {
-      try {
-        const customer = await solvaPay.getCustomer({ customerRef: cachedCustomerRef });
-        if (customer && customer.customerRef) {
-          if (customer.externalRef && customer.externalRef === userId) {
-            const filteredPurchases = (customer.purchases || []).filter(
-              (p) => p.status === "active"
-            );
-            return {
-              customerRef: customer.customerRef,
-              email: customer.email,
-              name: customer.name,
-              purchases: filteredPurchases
-            };
-          }
-        }
-      } catch {
-      }
-    }
-    const deduplicator = getSharedDeduplicator(options.deduplication);
-    const response = await deduplicator.deduplicate(userId, async () => {
-      try {
-        const ensuredCustomerRef = await solvaPay.ensureCustomer(userId, userId, {
-          email: email || void 0,
-          name: name || void 0
+    const response = await deduplicator.deduplicate(
+      userId,
+      async () => {
+        return await (0, import_server21.checkPurchaseCore)(request, {
+          solvaPay: options.solvaPay,
+          includeEmail: options.includeEmail,
+          includeName: options.includeName
         });
-        const customer = await solvaPay.getCustomer({ customerRef: ensuredCustomerRef });
-        const filteredPurchases = (customer.purchases || []).filter(
-          (p) => p.status === "active"
-        );
-        const result = {
-          customerRef: customer.customerRef || userId,
-          email: customer.email,
-          name: customer.name,
-          purchases: filteredPurchases
-        };
-        return result;
-      } catch (error) {
-        console.error("[checkPurchase] Error fetching customer:", error);
-        return {
-          customerRef: userId,
-          purchases: []
-        };
       }
-    });
+    );
+    if ((0, import_server21.isErrorResult)(response)) {
+      return import_server20.NextResponse.json(
+        { error: response.error, details: response.details },
+        { status: response.status }
+      );
+    }
     return response;
   } catch (error) {
     console.error("Check purchase failed:", error);
-    if (error instanceof import_core.SolvaPayError) {
-      return import_server20.NextResponse.json({ error: error.message }, { status: 500 });
-    }
     const errorMessage = error instanceof Error ? error.message : "Unknown error";
     return import_server20.NextResponse.json(
       { error: "Failed to check purchase", details: errorMessage },

package/dist/index.d.cts

@@ -380,40 +380,8 @@ interface CheckPurchaseOptions {
  * - Fast path optimization using cached customer references from client
  * - Automatic customer creation if needed
  *
- * The function:
- * 1. Extracts user ID from request (via requireUserId from @solvapay/auth)
- * 2. Gets user email and name from Supabase JWT token (if available)
- * 3. Validates cached customer reference (if provided via header)
- * 4. Ensures customer exists in SolvaPay backend
- * 5. Returns customer purchase information
- *
- * @param request - Next.js request object (NextRequest extends Request)
- * @param options - Configuration options
- * @param options.deduplication - Request deduplication options (see {@link RequestDeduplicationOptions})
- * @param options.solvaPay - Optional SolvaPay instance (creates new one if not provided)
- * @param options.includeEmail - Whether to include email in response (default: true)
- * @param options.includeName - Whether to include name in response (default: true)
- * @returns Purchase check result with customer data and purchases, or NextResponse error
- *
- * @example
- * ```typescript
- * import { NextRequest, NextResponse } from 'next/server';
- * import { checkPurchase } from '@solvapay/next';
- *
- * export async function GET(request: NextRequest) {
- *   const result = await checkPurchase(request);
- *
- *   if (result instanceof NextResponse) {
- *     return result; // Error response
- *   }
- *
- *   return NextResponse.json(result);
- * }
- * ```
- *
- * @see {@link clearPurchaseCache} for cache management
- * @see {@link getPurchaseCacheStats} for cache monitoring
- * @since 1.0.0
+ * Delegates to `checkPurchaseCore` from `@solvapay/server` for the actual logic,
+ * wrapping with Next.js-specific deduplication and response formatting.
  */
 declare function checkPurchase(request: Request, options?: CheckPurchaseOptions): Promise<PurchaseCheckResult | NextResponse>;
 

package/dist/index.d.ts

@@ -380,40 +380,8 @@ interface CheckPurchaseOptions {
  * - Fast path optimization using cached customer references from client
  * - Automatic customer creation if needed
  *
- * The function:
- * 1. Extracts user ID from request (via requireUserId from @solvapay/auth)
- * 2. Gets user email and name from Supabase JWT token (if available)
- * 3. Validates cached customer reference (if provided via header)
- * 4. Ensures customer exists in SolvaPay backend
- * 5. Returns customer purchase information
- *
- * @param request - Next.js request object (NextRequest extends Request)
- * @param options - Configuration options
- * @param options.deduplication - Request deduplication options (see {@link RequestDeduplicationOptions})
- * @param options.solvaPay - Optional SolvaPay instance (creates new one if not provided)
- * @param options.includeEmail - Whether to include email in response (default: true)
- * @param options.includeName - Whether to include name in response (default: true)
- * @returns Purchase check result with customer data and purchases, or NextResponse error
- *
- * @example
- * ```typescript
- * import { NextRequest, NextResponse } from 'next/server';
- * import { checkPurchase } from '@solvapay/next';
- *
- * export async function GET(request: NextRequest) {
- *   const result = await checkPurchase(request);
- *
- *   if (result instanceof NextResponse) {
- *     return result; // Error response
- *   }
- *
- *   return NextResponse.json(result);
- * }
- * ```
- *
- * @see {@link clearPurchaseCache} for cache management
- * @see {@link getPurchaseCacheStats} for cache monitoring
- * @since 1.0.0
+ * Delegates to `checkPurchaseCore` from `@solvapay/server` for the actual logic,
+ * wrapping with Next.js-specific deduplication and response formatting.
  */
 declare function checkPurchase(request: Request, options?: CheckPurchaseOptions): Promise<PurchaseCheckResult | NextResponse>;
 

package/dist/index.js

@@ -5,8 +5,7 @@ import {
 
 // src/index.ts
 import { NextResponse as NextResponse9 } from "next/server";
-import { createSolvaPay as createSolvaPay2 } from "@solvapay/server";
-import { SolvaPayError } from "@solvapay/core";
+import { checkPurchaseCore, isErrorResult as isErrorResult9 } from "@solvapay/server";
 
 // src/cache.ts
 function createRequestDeduplicator(options = {}) {
@@ -349,45 +348,23 @@ async function listPlans(request) {
 
 // src/helpers/usage.ts
 import { NextResponse as NextResponse8 } from "next/server";
-import { getAuthenticatedUserCore as getAuthenticatedUserCore5, isErrorResult as isErrorResult8, createSolvaPay } from "@solvapay/server";
+import { trackUsageCore, isErrorResult as isErrorResult8 } from "@solvapay/server";
 async function trackUsage(request, body, options = {}) {
-  try {
-    const userResult = await getAuthenticatedUserCore5(request);
-    if (isErrorResult8(userResult)) {
-      return NextResponse8.json(
-        { error: userResult.error, details: userResult.details },
-        { status: userResult.status }
-      );
-    }
-    const { userId, email, name } = userResult;
-    const solvaPay = options.solvaPay || createSolvaPay();
-    const customerRef = await solvaPay.ensureCustomer(userId, userId, {
-      email: email || void 0,
-      name: name || void 0
-    });
-    await solvaPay.trackUsage({
-      customerRef,
-      actionType: body.actionType,
-      units: body.units,
-      productRef: body.productRef,
-      description: body.description,
-      metadata: body.metadata
-    });
-    return NextResponse8.json({ success: true });
-  } catch (error) {
-    console.error("[trackUsage] Error:", error);
-    const message = error instanceof Error ? error.message : "Unknown error";
+  const result = await trackUsageCore(request, body, options);
+  if (isErrorResult8(result)) {
     return NextResponse8.json(
-      { error: "Track usage failed", details: message },
-      { status: 500 }
+      { error: result.error, details: result.details },
+      { status: result.status }
     );
   }
+  return NextResponse8.json(result);
 }
 
 // src/index.ts
 async function checkPurchase(request, options = {}) {
+  const deduplicator = getSharedDeduplicator(options.deduplication);
   try {
-    const { requireUserId, getUserEmailFromRequest, getUserNameFromRequest } = await import("@solvapay/auth");
+    const { requireUserId } = await import("@solvapay/auth");
     const userIdOrError = requireUserId(request);
     if (userIdOrError instanceof Response) {
       const clonedResponse = userIdOrError.clone();
@@ -395,61 +372,25 @@ async function checkPurchase(request, options = {}) {
       return NextResponse9.json(body, { status: userIdOrError.status });
     }
     const userId = userIdOrError;
-    const email = options.includeEmail !== false ? await getUserEmailFromRequest(request) : null;
-    const name = options.includeName !== false ? await getUserNameFromRequest(request) : null;
-    const cachedCustomerRef = request.headers.get("x-solvapay-customer-ref");
-    const solvaPay = options.solvaPay || createSolvaPay2();
-    if (cachedCustomerRef) {
-      try {
-        const customer = await solvaPay.getCustomer({ customerRef: cachedCustomerRef });
-        if (customer && customer.customerRef) {
-          if (customer.externalRef && customer.externalRef === userId) {
-            const filteredPurchases = (customer.purchases || []).filter(
-              (p) => p.status === "active"
-            );
-            return {
-              customerRef: customer.customerRef,
-              email: customer.email,
-              name: customer.name,
-              purchases: filteredPurchases
-            };
-          }
-        }
-      } catch {
-      }
-    }
-    const deduplicator = getSharedDeduplicator(options.deduplication);
-    const response = await deduplicator.deduplicate(userId, async () => {
-      try {
-        const ensuredCustomerRef = await solvaPay.ensureCustomer(userId, userId, {
-          email: email || void 0,
-          name: name || void 0
+    const response = await deduplicator.deduplicate(
+      userId,
+      async () => {
+        return await checkPurchaseCore(request, {
+          solvaPay: options.solvaPay,
+          includeEmail: options.includeEmail,
+          includeName: options.includeName
         });
-        const customer = await solvaPay.getCustomer({ customerRef: ensuredCustomerRef });
-        const filteredPurchases = (customer.purchases || []).filter(
-          (p) => p.status === "active"
-        );
-        const result = {
-          customerRef: customer.customerRef || userId,
-          email: customer.email,
-          name: customer.name,
-          purchases: filteredPurchases
-        };
-        return result;
-      } catch (error) {
-        console.error("[checkPurchase] Error fetching customer:", error);
-        return {
-          customerRef: userId,
-          purchases: []
-        };
       }
-    });
+    );
+    if (isErrorResult9(response)) {
+      return NextResponse9.json(
+        { error: response.error, details: response.details },
+        { status: response.status }
+      );
+    }
     return response;
   } catch (error) {
     console.error("Check purchase failed:", error);
-    if (error instanceof SolvaPayError) {
-      return NextResponse9.json({ error: error.message }, { status: 500 });
-    }
     const errorMessage = error instanceof Error ? error.message : "Unknown error";
     return NextResponse9.json(
       { error: "Failed to check purchase", details: errorMessage },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solvapay/next",
-  "version": "1.0.7",
+  "version": "1.0.9-preview.1",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -34,9 +34,9 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@solvapay/auth": "1.0.7",
-    "@solvapay/core": "1.0.7",
-    "@solvapay/server": "1.0.7"
+    "@solvapay/core": "1.0.9-preview.1",
+    "@solvapay/server": "1.0.9-preview.1",
+    "@solvapay/auth": "1.0.9-preview.1"
   },
   "peerDependencies": {
     "next": ">=13.0.0"