medusa-storefront-data 1.0.0 → 2.1.0

package/dist/server/customer.js

@@ -1,32 +1,31 @@
 "use server";
-import { sdk } from "../config";
 import medusaError from "../util/medusa-error";
 import { revalidateTag } from "next/cache";
 import { redirect } from "next/navigation";
 import { cookies } from "next/headers";
 import { getAuthHeaders, getCacheTag, getCartId, removeAuthToken, removeCartId, removeSyncLock, setAuthToken, setCartId, } from "../cookies";
+import { medusaAuthLogin, medusaAuthLogout, medusaAuthRegister, } from "medusa-services/auth";
+import { isAccountDeletionPendingError, medusaCustomerCreate, medusaCustomerCreateAddress, medusaCustomerDeleteAddress, medusaCustomerRetrieve, medusaCustomerUpdate, medusaCustomerUpdateAddress, } from "medusa-services/customer";
+import { medusaCartMerge, medusaCartTransfer } from "medusa-services/cart";
+import { getAuthClientOptions, getMedusaBackendUrl, getStoreCartClientOptions, } from "../util/store-client";
 import { cache } from "react";
+function throwCustomerError(error) {
+    if (error && typeof error === "object" && "response" in error) {
+        medusaError(error);
+    }
+    throw error instanceof Error ? error : new Error(String(error));
+}
 export const retrieveCustomer = cache(async () => {
     const authHeaders = await getAuthHeaders();
-    if (!authHeaders)
+    if (!("authorization" in authHeaders))
         return null;
-    const headers = {
-        ...authHeaders,
-    };
     try {
-        const { customer } = await sdk.client.fetch(`/store/customers/me`, {
-            method: "GET",
-            query: { fields: "*addresses" },
-            headers: headers,
-            cache: "no-store",
-        });
+        const options = await getStoreCartClientOptions();
+        const { customer } = await medusaCustomerRetrieve(options, { fields: "*addresses" });
         return customer;
     }
     catch (error) {
-        const errStr = error.toString().toLowerCase();
-        // If the error indicates a pending deletion, return a special object
-        if (errStr.includes("active account deletion request") ||
-            (error.message && error.message.toLowerCase().includes("active account deletion request"))) {
+        if (isAccountDeletionPendingError(error)) {
             const cookieStore = await cookies();
             const cookieEmail = cookieStore.get("_medusa_customer_email")?.value;
             return { id: "pending_deletion", email: cookieEmail || "pending" };
@@ -35,16 +34,16 @@ export const retrieveCustomer = cache(async () => {
     }
 });
 export const updateCustomer = async (body) => {
-    const headers = {
-        ...(await getAuthHeaders()),
-    };
-    const updateRes = await sdk.store.customer
-        .update(body, {}, headers)
-        .then(({ customer }) => customer)
-        .catch(medusaError);
-    const cacheTag = await getCacheTag("customers");
-    revalidateTag(cacheTag);
-    return updateRes;
+    try {
+        const options = await getStoreCartClientOptions();
+        const { customer } = await medusaCustomerUpdate(body, options);
+        const cacheTag = await getCacheTag("customers");
+        revalidateTag(cacheTag);
+        return customer;
+    }
+    catch (e) {
+        throwCustomerError(e);
+    }
 };
 export async function signup(_currentState, formData) {
     const password = formData.get("password");
@@ -55,19 +54,12 @@ export async function signup(_currentState, formData) {
         phone: formData.get("phone")?.replace(/[^\d+]/g, ""),
     };
     try {
-        const token = await sdk.auth.register("customer", "emailpass", {
-            email: customerForm.email,
-            password: password,
-        });
+        const authOptions = await getAuthClientOptions();
+        const token = await medusaAuthRegister({ email: customerForm.email, password }, authOptions);
         await setAuthToken(token);
-        const headers = {
-            ...(await getAuthHeaders()),
-        };
-        const { customer: createdCustomer } = await sdk.store.customer.create(customerForm, {}, headers);
-        const loginToken = await sdk.auth.login("customer", "emailpass", {
-            email: customerForm.email,
-            password,
-        });
+        const options = await getStoreCartClientOptions();
+        const { customer: createdCustomer } = await medusaCustomerCreate(customerForm, options);
+        const loginToken = await medusaAuthLogin({ email: customerForm.email, password }, authOptions);
         await setAuthToken(loginToken);
         const customerCacheTag = await getCacheTag("customers");
         revalidateTag(customerCacheTag);
@@ -81,34 +73,30 @@ export async function signup(_currentState, formData) {
 export async function login(_currentState, formData) {
     let email = formData.get("email_or_phone");
     const password = formData.get("password");
-    // Sanitize phone number: remove spaces, dashes, etc if it looks like a phone number
-    // If it doesn't have '@', we treat it as a potential phone number and clean it
     if (email && !email.includes("@")) {
         email = email.replace(/[^\d+]/g, "");
     }
     let shouldRedirect = false;
     let countryCode = "in";
     try {
-        const token = await sdk.auth.login("customer", "emailpass", { email_or_phone: email, password });
+        const authOptions = await getAuthClientOptions();
+        const token = await medusaAuthLogin({ email_or_phone: email, password }, authOptions);
         await setAuthToken(token);
-        // Store email in cookie for deletion flow (needed for cancellation modal)
         const cookieStore = await cookies();
         cookieStore.set("_medusa_customer_email", email, { maxAge: 60 * 60 * 24 * 7, path: "/" });
-        // Force a check to see if we are blocked
         try {
-            await sdk.store.customer.retrieve({}, {
-                authorization: `Bearer ${token}`
+            const options = await getStoreCartClientOptions();
+            await medusaCustomerRetrieve({
+                ...options,
+                authorization: `Bearer ${token}`,
             });
         }
         catch (err) {
-            const errStr = err.toString().toLowerCase();
-            if (errStr.includes("active account deletion request")) {
+            if (isAccountDeletionPendingError(err)) {
                 return "ACCOUNT_DELETION_PENDING";
             }
-            // If it's another error, we might still want to know, but deletion is our priority
             throw err;
         }
-        // Transfer cart after login success - Moved here to ensure execution
         try {
             await transferCart(token);
         }
@@ -121,35 +109,37 @@ export async function login(_currentState, formData) {
         shouldRedirect = true;
     }
     catch (error) {
-        const errorStr = error.toString().toLowerCase();
-        if (errorStr.includes("active account deletion request") ||
-            (error.message && error.message.toLowerCase().includes("active account deletion request"))) {
-            // Still set email cookie even if blocked
+        if (isAccountDeletionPendingError(error)) {
             const cookieStore = await cookies();
             cookieStore.set("_medusa_customer_email", email, { maxAge: 60 * 60 * 24 * 7, path: "/" });
             return "ACCOUNT_DELETION_PENDING";
         }
+        const errorStr = String(error).toLowerCase();
         if (errorStr.includes("invalid") || errorStr.includes("401") || errorStr.includes("not found")) {
             return "Invalid credentials. Please try again.";
         }
-        return error.message || error.toString();
+        return error instanceof Error ? error.message : String(error);
     }
     if (shouldRedirect) {
         const redirectUrl = formData.get("redirect_url");
-        // Check if it's a "keep-me-here" context (Wishlist or Review Popups)
         const hasKeepContext = redirectUrl?.includes("login_context=keep");
-        // Security + Context check
         if (redirectUrl && redirectUrl.startsWith("/") && hasKeepContext) {
             redirect(redirectUrl);
         }
         else {
-            // DEFAULT: Always Home Page
             redirect(`/${countryCode}`);
         }
     }
+    return null;
 }
 export async function signout(countryCode) {
-    await sdk.auth.logout();
+    try {
+        const authOptions = await getAuthClientOptions();
+        await medusaAuthLogout(authOptions);
+    }
+    catch {
+        // Continue local cleanup even if remote logout fails
+    }
     await removeAuthToken();
     await removeCartId();
     await removeSyncLock();
@@ -162,54 +152,34 @@ export async function signout(countryCode) {
 }
 export async function transferCart(token) {
     const cartId = await getCartId();
-    const authHeaders = token
-        ? { authorization: `Bearer ${token}` }
-        : await getAuthHeaders();
+    const options = await getStoreCartClientOptions();
+    const mergeOptions = token
+        ? { ...options, authorization: `Bearer ${token}` }
+        : options;
     console.log("--- TransferCart Debug ---");
     console.log("Token provided:", !!token);
     console.log("Guest Cart ID:", cartId);
-    const publishableKey = process.env.NEXT_PUBLIC_MEDUSA_PUBLISHABLE_KEY;
-    const backendUrl = process.env.MEDUSA_BACKEND_URL || process.env.NEXT_PUBLIC_MEDUSA_BACKEND_URL || "http://localhost:9000";
     try {
         console.log("Calling merge API (always)...");
-        const response = await fetch(`${backendUrl}/store/carts/merge`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-                "x-publishable-api-key": publishableKey || "",
-                ...authHeaders,
-            },
-            // Only include body if cartId exists
-            ...(cartId ? { body: JSON.stringify({ cart_id: cartId }) } : {}),
-            cache: "no-store",
-        });
-        if (response.ok) {
-            const data = await response.json();
+        const data = await medusaCartMerge(mergeOptions, cartId ?? undefined);
+        if (data) {
             console.log("--- Login Merge Response (JSON) ---");
             console.log(JSON.stringify(data, null, 2));
             console.log("-----------------------------------");
             const activeCartId = data.cart?.id || data.id || data.cart_id;
-            if (activeCartId) {
+            if (activeCartId && typeof activeCartId === "string") {
                 console.log("Storing Cart ID in cookie:", activeCartId);
                 await setCartId(activeCartId);
             }
         }
-        else if (response.status === 404) {
-            // 404 is fine - it just means the customer has no active cart yet
-            console.log("No active cart found for this customer (expected).");
-        }
         else {
-            const errorText = await response.text();
-            console.log(`Merge API Info (${response.status}):`, errorText);
-            if (cartId) {
-                await sdk.store.cart.transferCart(cartId, {}, authHeaders).catch(() => { });
-            }
+            console.log("No active cart found for this customer (expected).");
         }
     }
     catch (error) {
-        console.error("Merge API error:", error.message);
+        console.error("Merge API error:", error instanceof Error ? error.message : error);
         if (cartId) {
-            await sdk.store.cart.transferCart(cartId, {}, authHeaders).catch(() => { });
+            await medusaCartTransfer(cartId, mergeOptions).catch(() => { });
         }
     }
     console.log("--------------------------");
@@ -234,36 +204,30 @@ export const addCustomerAddress = async (currentState, formData) => {
         is_default_shipping: isDefaultShipping,
         metadata: {
             address_type: formData.get("address_type") || "HOME",
-        }
-    };
-    const headers = {
-        ...(await getAuthHeaders()),
+        },
     };
-    return sdk.store.customer
-        .createAddress(address, {}, headers)
-        .then(async ({ customer }) => {
+    try {
+        const options = await getStoreCartClientOptions();
+        await medusaCustomerCreateAddress(address, options);
         const customerCacheTag = await getCacheTag("customers");
         revalidateTag(customerCacheTag);
         return { success: true, error: null };
-    })
-        .catch((err) => {
-        return { success: false, error: err.toString() };
-    });
+    }
+    catch (err) {
+        return { success: false, error: String(err) };
+    }
 };
 export const deleteCustomerAddress = async (addressId) => {
-    const headers = {
-        ...(await getAuthHeaders()),
-    };
-    await sdk.store.customer
-        .deleteAddress(addressId, headers)
-        .then(async () => {
+    try {
+        const options = await getStoreCartClientOptions();
+        await medusaCustomerDeleteAddress(addressId, options);
         const customerCacheTag = await getCacheTag("customers");
         revalidateTag(customerCacheTag);
         return { success: true, error: null };
-    })
-        .catch((err) => {
-        return { success: false, error: err.toString() };
-    });
+    }
+    catch (err) {
+        return { success: false, error: String(err) };
+    }
 };
 export const updateCustomerAddress = async (currentState, formData) => {
     const addressId = currentState.addressId || formData.get("addressId");
@@ -282,44 +246,38 @@ export const updateCustomerAddress = async (currentState, formData) => {
         country_code: formData.get("country_code"),
         metadata: {
             address_type: formData.get("address_type") || "HOME",
-        }
+        },
     };
     const phone = formData.get("phone");
     if (phone) {
         address.phone = phone;
     }
-    const headers = {
-        ...(await getAuthHeaders()),
-    };
-    return sdk.store.customer
-        .updateAddress(addressId, address, {}, headers)
-        .then(async () => {
+    try {
+        const options = await getStoreCartClientOptions();
+        await medusaCustomerUpdateAddress(addressId, address, options);
         const customerCacheTag = await getCacheTag("customers");
         revalidateTag(customerCacheTag);
         return { success: true, error: null };
-    })
-        .catch((err) => {
-        return { success: false, error: err.toString() };
-    });
+    }
+    catch (err) {
+        return { success: false, error: String(err) };
+    }
 };
 export const setDefaultAddress = async (addressId) => {
-    const headers = {
-        ...(await getAuthHeaders()),
-    };
-    return sdk.store.customer
-        .updateAddress(addressId, { is_default_shipping: true }, {}, headers)
-        .then(async () => {
+    try {
+        const options = await getStoreCartClientOptions();
+        await medusaCustomerUpdateAddress(addressId, { is_default_shipping: true }, options);
         const customerCacheTag = await getCacheTag("customers");
         revalidateTag(customerCacheTag);
         return { success: true, error: null };
-    })
-        .catch((err) => {
-        return { success: false, error: err.toString() };
-    });
+    }
+    catch (err) {
+        return { success: false, error: String(err) };
+    }
 };
 export async function initiateGoogleAuth() {
     try {
-        const backendUrl = process.env.MEDUSA_BACKEND_URL || process.env.NEXT_PUBLIC_MEDUSA_BACKEND_URL;
+        const backendUrl = getMedusaBackendUrl();
         if (!backendUrl) {
             return { error: "Backend URL not configured" };
         }
@@ -338,18 +296,13 @@ export async function initiateGoogleAuth() {
         if (!redirectUrl) {
             return { error: "No redirect URL received from Google OAuth" };
         }
-        // Fix redirect URL: Remove country code prefix from callback URL if present
-        // Example: https://chocomelon.in/in/auth/customer/google/callback -> https://chocomelon.in/auth/customer/google/callback
         try {
             const url = new URL(redirectUrl);
-            const pathParts = url.pathname.split('/').filter(Boolean);
-            // Check if path starts with country code pattern (2-3 letter code)
+            const pathParts = url.pathname.split("/").filter(Boolean);
             if (pathParts.length > 0 && /^[a-z]{2,3}$/i.test(pathParts[0])) {
-                // Check if next part is 'auth'
-                if (pathParts.length > 1 && pathParts[1] === 'auth') {
-                    // Remove country code from path
+                if (pathParts.length > 1 && pathParts[1] === "auth") {
                     pathParts.shift();
-                    url.pathname = '/' + pathParts.join('/');
+                    url.pathname = "/" + pathParts.join("/");
                     redirectUrl = url.toString();
                 }
             }
@@ -368,7 +321,7 @@ export async function handleGoogleAuthCallback(params) {
         if (!params.code || !params.state) {
             return { error: "Missing authentication parameters" };
         }
-        const backendUrl = process.env.MEDUSA_BACKEND_URL || process.env.NEXT_PUBLIC_MEDUSA_BACKEND_URL;
+        const backendUrl = getMedusaBackendUrl();
         if (!backendUrl) {
             return { error: "Backend URL not configured" };
         }
@@ -403,13 +356,14 @@ export async function handleGoogleCallback(token, email, first_name, last_name)
         if (email && typeof email === "string") {
             const cookieStore = await cookies();
             cookieStore.set("_medusa_customer_email", email, { maxAge: 60 * 60 * 24 * 7, path: "/" });
-            const headers = await getAuthHeaders();
-            if (headers && "authorization" in headers) {
+            const options = await getStoreCartClientOptions();
+            if (options.authorization) {
                 try {
-                    await sdk.store.customer.create({ email, ...(first_name && { first_name }), ...(last_name && { last_name }) }, {}, headers);
+                    await medusaCustomerCreate({ email, ...(first_name && { first_name }), ...(last_name && { last_name }) }, options);
                 }
                 catch (err) {
                     if (!err.message?.includes("already exists") && !err.message?.includes("duplicate")) {
+                        // Ignore duplicate customer errors for OAuth sign-in
                     }
                 }
             }
@@ -429,7 +383,6 @@ export async function uploadProfileImage(formData) {
         if (!imageFile) {
             return { error: "No image file provided" };
         }
-        // Create new FormData with 'files' field as expected by the backend
         const uploadFormData = new FormData();
         uploadFormData.append("files", imageFile);
         const { uploadStoreFiles } = await import("medusa-reviews-logic/server");
@@ -441,14 +394,12 @@ export async function uploadProfileImage(formData) {
         if (!imageUrl) {
             throw new Error("No image URL returned from server");
         }
-        // Fetch current customer to preserve existing metadata
         const currentCustomer = await retrieveCustomer();
         const existingMetadata = currentCustomer?.metadata || {};
         const newMetadata = {
             ...existingMetadata,
             profile_image_url: imageUrl,
         };
-        // Update customer metadata
         await updateCustomer({ metadata: newMetadata });
         const customerCacheTag = await getCacheTag("customers");
         if (customerCacheTag) {

package/dist/server/dynamic-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-config.d.ts","sourceRoot":"","sources":["../../src/server/dynamic-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dynamic-config.d.ts","sourceRoot":"","sources":["../../src/server/dynamic-config.ts"],"names":[],"mappings":"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"}

package/dist/server/dynamic-config.js

@@ -84,10 +84,10 @@ export const getHomeBannersFromConfig = async () => {
                 const banner = item["homepage-banner"];
                 return {
                     image: banner?.["homepage-banner-image"],
-                    title: banner?.["homepage-banner-title"],
-                    subtitle: banner?.["homepage-banner-subtitle"],
-                    description: banner?.["homepage-banner-description"],
-                    buttonName: banner?.["homepage-banner-button-name"],
+                    title: normalizeCmsText(banner?.["homepage-banner-title"]),
+                    subtitle: normalizeCmsText(banner?.["homepage-banner-subtitle"]),
+                    description: normalizeCmsText(banner?.["homepage-banner-description"]),
+                    buttonName: normalizeBannerButtonName(banner?.["homepage-banner-button-name"]),
                     buttonLink: banner?.["homepage-banner-button-link"],
                 };
             });
@@ -107,10 +107,10 @@ export const getAppBannersFromConfig = async () => {
                 const banner = item["app-banner"];
                 return {
                     image: banner?.["app-banner-image"],
-                    title: banner?.["app-banner-title"],
-                    subtitle: banner?.["app-banner-subtitle"],
-                    description: banner?.["app-banner-description"],
-                    buttonName: banner?.["app-banner-button-name"],
+                    title: normalizeCmsText(banner?.["app-banner-title"]),
+                    subtitle: normalizeCmsText(banner?.["app-banner-subtitle"]),
+                    description: normalizeCmsText(banner?.["app-banner-description"]),
+                    buttonName: normalizeBannerButtonName(banner?.["app-banner-button-name"]),
                     buttonLink: banner?.["app-banner-button-link"],
                 };
             });
@@ -143,7 +143,7 @@ export const getFeaturesFromConfig = async () => {
         const homepageConfig = config?.["homepage-config"];
         if (!homepageConfig)
             return null;
-        const title = homepageConfig["why-choose-us-title"] || "Why Choose Chocomelon?";
+        const title = homepageConfig["why-choose-us-title"] || "Why Choose Us?";
         const featuresRaw = homepageConfig["why-choose-us-features"] || [];
         const features = featuresRaw.map((item) => {
             const feature = item?.feature || item;
@@ -158,6 +158,32 @@ export const getFeaturesFromConfig = async () => {
         return null;
     }
 };
+const EMAIL_PATTERN = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+/** Fix common UTF-8 mojibake from CMS copy-paste (e.g. em dash, apostrophe). */
+function normalizeCmsText(value) {
+    if (typeof value !== "string" || !value.trim())
+        return undefined;
+    return value
+        .trim()
+        .replace(/ΓÇö/g, "—")
+        .replace(/ΓÇÖ/g, "'")
+        .replace(/ΓÇ£|ΓÇ¥/g, '"')
+        .replace(/≡ƒÿÄ≡ƒæòΓ£¿/g, " 👕✨");
+}
+function normalizeBannerButtonName(value) {
+    const text = normalizeCmsText(value);
+    if (!text)
+        return undefined;
+    if (/^shop\s+now\s*1$/i.test(text))
+        return "Shop Now";
+    return text;
+}
+function normalizeConfigEmail(value) {
+    if (typeof value !== "string")
+        return undefined;
+    const trimmed = value.trim();
+    return EMAIL_PATTERN.test(trimmed) ? trimmed : undefined;
+}
 export const getContactInfoFromConfig = async () => {
     try {
         const config = await getDynamicConfig();
@@ -167,7 +193,7 @@ export const getContactInfoFromConfig = async () => {
         }
         return {
             phone: contactConfig["contact-phone"],
-            email: contactConfig["contact-email"],
+            email: normalizeConfigEmail(contactConfig["contact-email"]),
             address: contactConfig["contact-address"],
         };
     }
@@ -251,10 +277,10 @@ export const getPromoBarConfig = async () => {
         const config = await getDynamicConfig();
         const promoConfig = config?.["homepage-config"]?.["promo-bar"];
         return {
-            text: promoConfig?.["promo-text"] || null,
+            text: normalizeCmsText(promoConfig?.["promo-text"]) || null,
             code: promoConfig?.["promo-code"] || null,
             value: promoConfig?.["promo-value"] || null,
-            active: promoConfig?.["promo-active"] ?? false
+            active: promoConfig?.["promo-active"] ?? false,
         };
     }
     catch (error) {

package/dist/server/fulfillment.d.ts

@@ -1,4 +1,5 @@
-export declare const listCartShippingMethods: (cartId: string) => Promise<any>;
-export declare const calculatePriceForShippingOption: (optionId: string, cartId: string, data?: Record<string, unknown>) => Promise<any>;
-export declare const getShiprocketServiceability: (pincode: string, variant_id: string, cod?: number) => Promise<any>;
+import { HttpTypes } from "@medusajs/types";
+export declare const listCartShippingMethods: (cartId: string) => Promise<HttpTypes.StoreCartShippingOptionWithServiceZone[] | null>;
+export declare const calculatePriceForShippingOption: (optionId: string, cartId: string, data?: Record<string, unknown>) => Promise<HttpTypes.StoreCartShippingOption | null>;
+export declare const getShiprocketServiceability: (pincode: string, variant_id: string, cod?: number) => Promise<import("medusa-services/fulfillment").ShiprocketServiceabilityResult | null>;
 //# sourceMappingURL=fulfillment.d.ts.map

package/dist/server/fulfillment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fulfillment.d.ts","sourceRoot":"","sources":["../../src/server/fulfillment.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,uBAAuB,GAAU,QAAQ,MAAM,iBA0B3D,CAAA;AAED,eAAO,MAAM,+BAA+B,GAC1C,UAAU,MAAM,EAChB,QAAQ,MAAM,EACd,OAAO,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,iBA8B/B,CAAA;AAED,eAAO,MAAM,2BAA2B,GAAU,SAAS,MAAM,EAAE,YAAY,MAAM,EAAE,MAAK,MAAU,iBA2BrG,CAAA"}
+{"version":3,"file":"fulfillment.d.ts","sourceRoot":"","sources":["../../src/server/fulfillment.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAQ3C,eAAO,MAAM,uBAAuB,GAAU,QAAQ,MAAM,uEA0B3D,CAAA;AAED,eAAO,MAAM,+BAA+B,GAC1C,UAAU,MAAM,EAChB,QAAQ,MAAM,EACd,OAAO,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,sDAc/B,CAAA;AAED,eAAO,MAAM,2BAA2B,GAAU,SAAS,MAAM,EAAE,YAAY,MAAM,EAAE,MAAK,MAAU,yFAWrG,CAAA"}

package/dist/server/fulfillment.js

@@ -1,6 +1,8 @@
 "use server";
 import { sdk } from "../config";
 import { getAuthHeaders, getCacheOptions } from "../cookies";
+import { medusaShippingOptionCalculate, medusaShiprocketServiceability, } from "medusa-services/fulfillment";
+import { getStoreCartClientOptions } from "../util/store-client";
 export const listCartShippingMethods = async (cartId) => {
     const headers = {
         ...(await getAuthHeaders()),
@@ -24,49 +26,22 @@ export const listCartShippingMethods = async (cartId) => {
     });
 };
 export const calculatePriceForShippingOption = async (optionId, cartId, data) => {
-    const headers = {
-        ...(await getAuthHeaders()),
-    };
-    const next = {
-        ...(await getCacheOptions("fulfillment")),
-    };
-    const body = { cart_id: cartId, data };
-    if (data) {
-        body.data = data;
+    try {
+        const options = await getStoreCartClientOptions();
+        const { shipping_option } = await medusaShippingOptionCalculate(optionId, cartId, options, data);
+        return shipping_option;
     }
-    return sdk.client
-        .fetch(`/store/shipping-options/${optionId}/calculate`, {
-        method: "POST",
-        body,
-        headers,
-        next,
-    })
-        .then(({ shipping_option }) => shipping_option)
-        .catch((e) => {
+    catch (e) {
         return null;
-    });
+    }
 };
 export const getShiprocketServiceability = async (pincode, variant_id, cod = 0) => {
-    const headers = {
-        ...(await getAuthHeaders()),
-    };
-    return sdk.client
-        .fetch(`/store/shiprocket/serviceability`, {
-        method: "GET",
-        query: {
-            pincode,
-            variant_id,
-            cod: cod.toString(),
-        },
-        headers,
-        cache: "no-store",
-    })
-        .then((data) => data)
-        .catch(async (e) => {
-        if (e.response) {
-            const errorData = await e.response.json();
-            throw new Error(errorData.message || "Failed to check serviceability");
-        }
-        throw e;
-    });
+    try {
+        const options = await getStoreCartClientOptions();
+        return await medusaShiprocketServiceability({ pincode, variant_id, cod }, options);
+    }
+    catch {
+        // Missing variant dimensions or Shiprocket unavailable — checkout must continue.
+        return null;
+    }
 };