arky-sdk 0.3.3 → 0.3.5

package/dist/index.cjs

@@ -165,13 +165,6 @@ var createEshopApi = (apiConfig) => {
         }
       );
     },
-    async getProductBySlug(params, options) {
-      const { businessId, slug } = params;
-      return apiConfig.httpClient.get(
-        `/v1/businesses/${encodeURIComponent(businessId)}/products/slug/${encodeURIComponent(businessId)}/${encodeURIComponent(slug)}`,
-        options
-      );
-    },
     // ===== ORDERS =====
     async createOrder(params, options) {
       return apiConfig.httpClient.post(
@@ -226,7 +219,7 @@ var createEshopApi = (apiConfig) => {
       }));
       const payload = {
         businessId: apiConfig.businessId,
-        market: params.market,
+        market: apiConfig.market,
         currency: params.currency,
         paymentMethod: params.paymentMethod,
         lines,
@@ -238,7 +231,7 @@ var createEshopApi = (apiConfig) => {
     async checkout(params, options) {
       const payload = {
         businessId: apiConfig.businessId,
-        market: params.market,
+        market: apiConfig.market,
         paymentMethod: params.paymentMethod,
         shippingMethodId: params.shippingMethodId,
         items: params.items,
@@ -276,8 +269,8 @@ var createReservationApi = (apiConfig) => {
     async checkout(params, options) {
       const payload = {
         businessId: apiConfig.businessId,
+        market: apiConfig.market,
         blocks: params.blocks || [],
-        market: params.market || "US",
         parts: params.parts,
         ...params.paymentMethod && { paymentMethod: params.paymentMethod },
         ...params.promoCode && { promoCode: params.promoCode }
@@ -321,7 +314,7 @@ var createReservationApi = (apiConfig) => {
       }));
       const payload = {
         businessId: apiConfig.businessId,
-        market: params.market,
+        market: apiConfig.market,
         currency: params.currency,
         paymentMethod: params.paymentMethod,
         lines,
@@ -484,7 +477,7 @@ var createNewsletterApi = (apiConfig) => {
       const payload = {
         newsletterId,
         email,
-        market: "US",
+        market: apiConfig.market,
         ...customerId && { customerId },
         ...payment && { payment }
       };
@@ -1368,11 +1361,14 @@ function getMarketPrice(prices, marketId, businessMarkets, options = {}) {
     showSymbols = true,
     decimalPlaces = 2,
     showCompareAt = true,
-    fallbackMarket = "US"
+    fallbackMarket
   } = options;
   let price = prices.find((p) => p.market === marketId);
+  if (!price && fallbackMarket) {
+    price = prices.find((p) => p.market === fallbackMarket);
+  }
   if (!price) {
-    price = prices.find((p) => p.market === fallbackMarket) || prices[0];
+    price = prices[0];
   }
   if (!price) return "";
   let currency;
@@ -1405,9 +1401,15 @@ function getMarketPrice(prices, marketId, businessMarkets, options = {}) {
   }
   return formattedPrice;
 }
-function getPriceAmount(prices, marketId, fallbackMarket = "US") {
+function getPriceAmount(prices, marketId, fallbackMarket) {
   if (!prices || prices.length === 0) return 0;
-  const price = prices.find((p) => p.market === marketId) || prices.find((p) => p.market === fallbackMarket) || prices[0];
+  let price = prices.find((p) => p.market === marketId);
+  if (!price && fallbackMarket) {
+    price = prices.find((p) => p.market === fallbackMarket);
+  }
+  if (!price) {
+    price = prices[0];
+  }
   return price?.amount || 0;
 }
 function createPaymentForCheckout(subtotalMinor, marketId, currency, paymentMethod, options = {}) {
@@ -1620,6 +1622,39 @@ function validateRequired(value, fieldName = "This field") {
 // src/services/createHttpClient.ts
 function createHttpClient(cfg) {
   const refreshEndpoint = `${cfg.baseUrl}/v1/users/refresh-access-token`;
+  let refreshPromise = null;
+  async function ensureFreshToken() {
+    if (refreshPromise) {
+      return refreshPromise;
+    }
+    refreshPromise = (async () => {
+      const { refreshToken, provider } = await cfg.getToken();
+      if (!refreshToken) {
+        cfg.logout();
+        const err = new Error("No refresh token available");
+        err.name = "ApiError";
+        err.statusCode = 401;
+        throw err;
+      }
+      const refRes = await fetch(refreshEndpoint, {
+        method: "POST",
+        headers: { Accept: "application/json", "Content-Type": "application/json" },
+        body: JSON.stringify({ provider, refreshToken })
+      });
+      if (!refRes.ok) {
+        cfg.logout();
+        const err = new Error("Token refresh failed");
+        err.name = "ApiError";
+        err.statusCode = 401;
+        throw err;
+      }
+      const data = await refRes.json();
+      cfg.setToken(data);
+    })().finally(() => {
+      refreshPromise = null;
+    });
+    return refreshPromise;
+  }
   async function request(method, path, body, options) {
     if (options?.transformRequest) {
       body = options.transformRequest(body);
@@ -1629,33 +1664,12 @@ function createHttpClient(cfg) {
       "Content-Type": "application/json",
       ...options?.headers || {}
     };
-    let { accessToken, refreshToken, provider, expiresAt } = await cfg.getTokens();
+    let { accessToken, expiresAt } = await cfg.getToken();
     const nowSec = Date.now() / 1e3;
     if (expiresAt && nowSec > expiresAt) {
-      if (refreshToken) {
-        const refRes = await fetch(refreshEndpoint, {
-          method: "POST",
-          headers: { Accept: "application/json", "Content-Type": "application/json" },
-          body: JSON.stringify({ provider, refreshToken })
-        });
-        if (refRes.ok) {
-          const data2 = await refRes.json();
-          cfg.setTokens(data2);
-          accessToken = data2.accessToken;
-        } else {
-          cfg.logout();
-          const err = new Error("Error refreshing token");
-          err.name = "ApiError";
-          err.statusCode = 401;
-          throw err;
-        }
-      } else {
-        cfg.logout();
-        const err = new Error("No refresh token");
-        err.name = "ApiError";
-        err.statusCode = 401;
-        throw err;
-      }
+      await ensureFreshToken();
+      const tokens = await cfg.getToken();
+      accessToken = tokens.accessToken;
     }
     if (accessToken) {
       headers["Authorization"] = `Bearer ${accessToken}`;
@@ -1665,15 +1679,42 @@ function createHttpClient(cfg) {
     if (!["GET", "DELETE"].includes(method) && body !== void 0) {
       fetchOpts.body = JSON.stringify(body);
     }
+    const fullUrl = `${cfg.baseUrl}${finalPath}`;
     let res;
     let data;
     try {
-      const fullUrl = `${cfg.baseUrl}${finalPath}`;
       res = await fetch(fullUrl, fetchOpts);
-      data = await res.json();
     } catch (error) {
       const err = new Error(error instanceof Error ? error.message : "Network request failed");
       err.name = "NetworkError";
+      err.method = method;
+      err.url = fullUrl;
+      throw err;
+    }
+    if (res.status === 401 && !options?.["_retried"]) {
+      try {
+        await ensureFreshToken();
+        const tokens = await cfg.getToken();
+        headers["Authorization"] = `Bearer ${tokens.accessToken}`;
+        fetchOpts.headers = headers;
+        return request(method, path, body, { ...options, _retried: true });
+      } catch (refreshError) {
+      }
+    }
+    try {
+      const contentLength = res.headers.get("content-length");
+      const contentType = res.headers.get("content-type");
+      if (res.status === 204 || contentLength === "0" || !contentType?.includes("application/json")) {
+        data = {};
+      } else {
+        data = await res.json();
+      }
+    } catch (error) {
+      const err = new Error("Failed to parse response");
+      err.name = "ParseError";
+      err.method = method;
+      err.url = fullUrl;
+      err.status = res.status;
       throw err;
     }
     if (!res.ok) {
@@ -1684,8 +1725,12 @@ function createHttpClient(cfg) {
       }
       const err = new Error(serverErr.message || "Request failed");
       err.name = "ApiError";
-      err.statusCode = serverErr.statusCode;
+      err.statusCode = serverErr.statusCode || res.status;
       err.validationErrors = reqErr.validationErrors;
+      err.method = method;
+      err.url = fullUrl;
+      const requestId = res.headers.get("x-request-id") || res.headers.get("request-id");
+      if (requestId) err.requestId = requestId;
       throw err;
     }
     if (options?.successMessage && cfg.notify) {
@@ -1703,9 +1748,18 @@ function createHttpClient(cfg) {
 }
 
 // src/index.ts
-var SDK_VERSION = "0.3.3";
-var SUPPORTED_FRAMEWORKS = ["astro", "react", "vue", "svelte", "vanilla"];
+var SDK_VERSION = "0.3.5";
+var SUPPORTED_FRAMEWORKS = [
+  "astro",
+  "react",
+  "vue",
+  "svelte",
+  "vanilla"
+];
 function createArkySDK(config) {
+  console.log(
+    `[bruda2 Arky SDK v${SDK_VERSION}] Initializing with market: ${config.market}, businessId: ${config.businessId}`
+  );
   const httpClient = createHttpClient(config);
   const storageUrl = config.storageUrl || "https://storage.arky.io/dev";
   const apiConfig = {
@@ -1713,9 +1767,9 @@ function createArkySDK(config) {
     businessId: config.businessId,
     storageUrl,
     baseUrl: config.baseUrl,
-    market: config.market || "US",
-    setTokens: config.setTokens,
-    getTokens: config.getTokens
+    market: config.market,
+    setTokens: config.setToken,
+    getTokens: config.getToken
   };
   const userApi = createUserApi(apiConfig);
   const autoGuest = config.autoGuest !== void 0 ? config.autoGuest : true;
@@ -1736,9 +1790,13 @@ function createArkySDK(config) {
       apiConfig.businessId = businessId;
     },
     getBusinessId: () => apiConfig.businessId,
+    setMarket: (market) => {
+      apiConfig.market = market;
+    },
+    getMarket: () => apiConfig.market,
     isAuthenticated: config.isAuthenticated || (() => false),
     logout: config.logout,
-    setTokens: config.setTokens,
+    setToken: config.setToken,
     utils: {
       getImageUrl: (imageBlock, isBlock = true) => getImageUrl(imageBlock, isBlock, storageUrl),
       thumbnailUrl: (service) => thumbnailUrl(service, storageUrl),
@@ -1757,10 +1815,13 @@ function createArkySDK(config) {
   if (autoGuest) {
     Promise.resolve().then(async () => {
       try {
-        const tokens = await config.getTokens();
+        const tokens = await config.getToken();
         if (!tokens.accessToken && !tokens.refreshToken) {
           const guestToken = await userApi.getGuestToken({});
-          console.log("[SDK Init] Created guest token:", guestToken ? "Success" : "Failed");
+          console.log(
+            "[SDK Init] Created guest token:",
+            guestToken ? "Success" : "Failed"
+          );
         } else {
           console.log("[SDK Init] Using existing token from storage");
         }