@akinon/next 1.107.0 → 1.108.0-rc.87

package/data/server/basket.ts

@@ -0,0 +1,72 @@
+import { Cache, CacheKey } from '../../lib/cache';
+import { basket } from '../../data/urls';
+import { Basket } from '../../types';
+import appFetch from '../../utils/app-fetch';
+import { ServerVariables } from '../../utils/server-variables';
+import logger from '../../utils/log';
+
+type GetBasketParams = {
+  locale?: string;
+  currency?: string;
+  namespace?: string;
+};
+
+const getBasketDataHandler = ({
+  locale,
+  currency,
+  namespace
+}: GetBasketParams) => {
+  return async function () {
+    try {
+      const url = namespace
+        ? basket.getBasketDetail(namespace)
+        : basket.getBasket;
+
+      const basketData = await appFetch<{ basket: Basket }>({
+        url,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json'
+          }
+        }
+      });
+
+      if (!basketData?.basket) {
+        logger.warn('Basket data is undefined', {
+          handler: 'getBasketDataHandler',
+          namespace
+        });
+      }
+
+      return basketData;
+    } catch (error) {
+      logger.error('Error fetching basket data', {
+        handler: 'getBasketDataHandler',
+        error,
+        namespace
+      });
+      throw error;
+    }
+  };
+};
+
+export const getBasketData = async ({
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency,
+  namespace
+}: GetBasketParams = {}) => {
+  return Cache.wrap(
+    CacheKey.Basket(namespace),
+    locale,
+    getBasketDataHandler({ locale, currency, namespace }),
+    {
+      expire: 0,
+      cache: false
+    }
+  );
+};
+
+

package/data/server/category.ts

@@ -5,7 +5,6 @@ import { category, product } from '../urls';
 import { Cache, CacheKey } from '../../lib/cache';
 import { parse } from 'lossless-json';
 import logger from '../../utils/log';
-import { headers as nHeaders } from 'next/headers';
 import { ServerVariables } from '../../utils/server-variables';
 
 function getCategoryDataHandler(
@@ -18,19 +17,30 @@ function getCategoryDataHandler(
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    const rawData = await appFetch<string>({
-      url: `${category.getCategoryByPk(pk)}${params ? params : ''}`,
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-          ...(headers ?? {})
-        }
-      },
-      responseType: FetchResponseType.TEXT
-    });
+    let rawData: string;
+
+    try {
+      rawData = await appFetch<string>({
+        url: `${category.getCategoryByPk(pk)}${params ? params : ''}`,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+            ...(headers ?? {})
+          }
+        },
+        responseType: FetchResponseType.TEXT
+      });
+    } catch (error) {
+      logger.error('Failed to fetch category data', {
+        handler: 'getCategoryDataHandler',
+        pk,
+        error: error.message
+      });
+      return null;
+    }
 
     let data: GetCategoryResponse;
 
@@ -64,17 +74,27 @@ function getCategoryDataHandler(
       return { data, breadcrumbData: undefined };
     }
 
-    const breadcrumbData = await appFetch<any>({
-      url: product.breadcrumbUrl(menuItemModel),
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json'
+    let breadcrumbData: { menu?: unknown } = {};
+
+    try {
+      breadcrumbData = await appFetch<{ menu?: unknown }>({
+        url: product.breadcrumbUrl(menuItemModel),
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json'
+          }
         }
-      }
-    });
+      });
+    } catch (error) {
+      logger.warn('Failed to fetch breadcrumb data', {
+        handler: 'getCategoryDataHandler',
+        pk,
+        error: error.message
+      });
+    }
 
     return { data, breadcrumbData: breadcrumbData?.menu };
   };

package/data/server/flatpage.ts

@@ -11,20 +11,24 @@ const getFlatPageDataHandler = (
   headers?: Record<string, string>
 ) => {
   return async function () {
-    const data = await appFetch<FlatPage>({
-      url: flatpage.getFlatPageByPk(pk),
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-          ...(headers ?? {})
+    try {
+      const data = await appFetch<FlatPage>({
+        url: flatpage.getFlatPageByPk(pk),
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+            ...(headers ?? {})
+          }
         }
-      }
-    });
+      });
 
-    return data;
+      return data;
+    } catch (error) {
+      return null;
+    }
   };
 };
 

package/data/server/landingpage.ts

@@ -11,20 +11,24 @@ const getLandingPageHandler = (
   headers?: Record<string, string>
 ) => {
   return async function () {
-    const data = await appFetch<LandingPage>({
-      url: landingpage.getLandingPageByPk(pk),
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-          ...(headers ?? {})
+    try {
+      const data = await appFetch<LandingPage>({
+        url: landingpage.getLandingPageByPk(pk),
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+            ...(headers ?? {})
+          }
         }
-      }
-    });
+      });
 
-    return data;
+      return data;
+    } catch (error) {
+      return null;
+    }
   };
 };
 

package/data/server/list.ts

@@ -16,19 +16,29 @@ const getListDataHandler = (
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    const rawData = await appFetch<string>({
-      url: `${category.list}${params}`,
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-          ...(headers ?? {})
-        }
-      },
-      responseType: FetchResponseType.TEXT
-    });
+    let rawData: string;
+
+    try {
+      rawData = await appFetch<string>({
+        url: `${category.list}${params}`,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+            ...(headers ?? {})
+          }
+        },
+        responseType: FetchResponseType.TEXT
+      });
+    } catch (error) {
+      logger.error('Failed to fetch list data', {
+        handler: 'getListDataHandler',
+        error: error.message
+      });
+      return null;
+    }
 
     let data: GetCategoryResponse;
 

package/data/server/special-page.ts

@@ -15,20 +15,24 @@ const getSpecialPageDataHandler = (
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    const data: GetCategoryResponse = await appFetch({
-      url: `${category.getSpecialPageByPk(pk)}${params}`,
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-          ...(headers ?? {})
+    try {
+      const data: GetCategoryResponse = await appFetch({
+        url: `${category.getSpecialPageByPk(pk)}${params}`,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+            ...(headers ?? {})
+          }
         }
-      }
-    });
+      });
 
-    return data;
+      return data;
+    } catch (error) {
+      return null;
+    }
   };
 };
 

package/data/urls.ts

@@ -183,7 +183,11 @@ export const product = {
   breadcrumbUrl: (menuitemmodel: string) =>
     `/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`,
   bundleProduct: (productPk: string, queryString: string) =>
-    `/bundle-product/${productPk}/?${queryString}`
+    `/bundle-product/${productPk}/?${queryString}`,
+  similarProducts: (params?: string) =>
+    `/similar-products${params ? `?${params}` : ''}`,
+  similarProductsList: (params?: string) =>
+    `/similar-product-list${params ? `?${params}` : ''}`
 };
 
 export const wishlist = {

package/hocs/server/with-segment-defaults.tsx

@@ -72,10 +72,13 @@ const addRootLayoutProps = async (componentProps: RootLayoutProps) => {
 const checkRedisVariables = () => {
   const requiredVariableValues = [
     process.env.CACHE_HOST,
-    process.env.CACHE_PORT,
-    process.env.CACHE_SECRET
+    process.env.CACHE_PORT
   ];
 
+  if (!settings.usePrettyUrlRoute) {
+    requiredVariableValues.push(process.env.CACHE_SECRET);
+  }
+
   if (
     !requiredVariableValues.every((v) => v) &&
     process.env.NODE_ENV === 'production'

package/hooks/use-localization.ts

@@ -4,7 +4,6 @@ import { LocalizationContext } from '../localization/provider';
 import { useContext } from 'react';
 import { setCookie, urlLocaleMatcherRegex } from '../utils';
 import { LocaleUrlStrategy } from '../localization';
-import { useRouter } from 'next/navigation';
 
 export const useLocalization = () => {
   const {
@@ -18,8 +17,6 @@ export const useLocalization = () => {
     localeUrlStrategy
   } = useContext(LocalizationContext);
 
-  const router = useRouter();
-
   /**
    * Sets the locale in the URL.
    * @param locale Locale value defined in the settings.
@@ -30,6 +27,8 @@ export const useLocalization = () => {
 
     let targetUrl;
 
+    setCookie('pz-locale', locale);
+
     if (localeUrlStrategy === LocaleUrlStrategy.Subdomain) {
       const hostParts = hostname.split('.');
       const subDomain = hostParts[0];

package/middlewares/complete-gpay.ts

@@ -148,7 +148,8 @@ const withCompleteGpay =
       logger.info('Redirecting to order success page', {
         middleware: 'complete-gpay',
         redirectUrlWithLocale,
-        ip
+        ip,
+        setCookie: request.headers.get('set-cookie')
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/complete-masterpass.ts

@@ -149,7 +149,8 @@ const withCompleteMasterpass =
       logger.info('Redirecting to order success page', {
         middleware: 'complete-masterpass',
         redirectUrlWithLocale,
-        ip
+        ip,
+        setCookie: request.headers.get('set-cookie')
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/locale.ts

@@ -23,7 +23,15 @@ const getMatchedLocale = (pathname: string, req: PzNextRequest) => {
       );
 
       if (subDomainLocaleMatched && subDomainLocaleMatched[0]) {
-        matchedLocale = subDomainLocaleMatched[0].slice(1);
+        const subdomainLocale = subDomainLocaleMatched[0].slice(1);
+
+        const isValidSubdomainLocale = settings.localization.locales.find(
+          (l) => l.value === subdomainLocale
+        );
+
+        if (isValidSubdomainLocale) {
+          matchedLocale = subdomainLocale;
+        }
       }
     }
   }

package/middlewares/redirection-payment.ts

@@ -149,7 +149,8 @@ const withRedirectionPayment =
       logger.info('Redirecting to order success page', {
         middleware: 'redirection-payment',
         redirectUrlWithLocale,
-        ip
+        ip,
+        setCookie: request.headers.get('set-cookie')
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/saved-card-redirection.ts

@@ -149,7 +149,8 @@ const withSavedCardRedirection =
       logger.info('Redirecting to order success page', {
         middleware: 'saved-card-redirection',
         redirectUrlWithLocale,
-        ip
+        ip,
+        setCookie: request.headers.get('set-cookie')
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/three-d-redirection.ts

@@ -148,7 +148,8 @@ const withThreeDRedirection =
       logger.info('Redirecting to order success page', {
         middleware: 'three-d-redirection',
         redirectUrlWithLocale,
-        ip
+        ip,
+        setCookie: request.headers.get('set-cookie')
       });
 
       // Using POST method while redirecting causes an error,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.107.0",
+  "version": "1.108.0-rc.87",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -35,7 +35,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.107.0",
+    "@akinon/eslint-plugin-projectzero": "1.108.0-rc.87",
     "@babel/core": "7.26.10",
     "@babel/preset-env": "7.26.9",
     "@babel/preset-typescript": "7.27.0",

package/plugins.d.ts

@@ -46,3 +46,11 @@ declare module '@akinon/pz-cybersource-uc' {
 }
 
 declare module '@akinon/pz-flow-payment' {}
+
+declare module '@akinon/pz-similar-products' {
+  export const SimilarProductsModal: any;
+  export const SimilarProductsFilterSidebar: any;
+  export const SimilarProductsResultsGrid: any;
+  export const SimilarProductsPlugin: any;
+  export const SimilarProductsButtonPlugin: any;
+}

package/redux/middlewares/checkout.ts

@@ -51,7 +51,11 @@ export const errorMiddleware: Middleware = ({ dispatch }: MiddlewareParams) => {
     const result: CheckoutResult = next(action);
     const errors = result?.payload?.errors;
 
-    if (errors) {
+    if (
+      !!errors &&
+      ((typeof errors === 'object' && Object.keys(errors).length > 0) ||
+        (Array.isArray(errors) && errors.length > 0))
+    ) {
       dispatch(setErrors(errors));
     }
 

package/types/commerce/order.ts

@@ -114,6 +114,7 @@ export interface Order {
     pk: number;
     name: string;
     slug: string;
+    logo: string;
     [key: string]: any;
   };
 }

package/types/index.ts

@@ -83,6 +83,12 @@ export interface Settings {
   };
   usePrettyUrlRoute?: boolean;
   commerceUrl: string;
+  /**
+   * This option allows you to track Sentry events on the client side, in addition to server and edge environments.
+   *
+   * It overrides process.env.NEXT_PUBLIC_SENTRY_DSN and process.env.SENTRY_DSN.
+   */
+  sentryDsn?: string;
   redis: {
     defaultExpirationTime: number;
   };

package/utils/app-fetch.ts

@@ -43,12 +43,12 @@ const appFetch = async <T>({
     const requestURL = `${decodeURIComponent(commerceUrl)}${url}`;
 
     init.headers = {
+      cookie: nextCookies.toString(),
       ...(init.headers ?? {}),
       ...(ServerVariables.globalHeaders ?? {}),
       'Accept-Language': currentLocale.apiValue,
       'x-currency': currency,
-      'x-forwarded-for': ip,
-      cookie: nextCookies.toString()
+      'x-forwarded-for': ip
     };
 
     init.next = {
@@ -60,6 +60,11 @@ const appFetch = async <T>({
     status = req.status;
     logger.debug(`FETCH END ${url}`, { status: req.status, ip });
 
+    if (!req.ok) {
+      const errorMessage = `HTTP ${req.status}: ${req.statusText}`;
+      throw new Error(errorMessage);
+    }
+
     if (responseType === FetchResponseType.JSON) {
       response = (await req.json()) as T;
     } else {

package/utils/redirect.ts

@@ -1,18 +1,33 @@
 import { redirect as nextRedirect, RedirectType } from 'next/navigation';
 import Settings from 'settings';
-import { headers } from 'next/headers';
-import { ServerVariables } from '@akinon/next/utils/server-variables';
+import { headers, cookies } from 'next/headers';
 import { getUrlPathWithLocale } from '@akinon/next/utils/localization';
 import { urlLocaleMatcherRegex } from '@akinon/next/utils';
 
 export const redirect = (path: string, type?: RedirectType) => {
   const nextHeaders = headers();
+  const nextCookies = cookies();
   const pageUrl = new URL(
     nextHeaders.get('pz-url') ?? process.env.NEXT_PUBLIC_URL ?? ''
   );
 
+  let currentLocaleValue = Settings.localization.defaultLocaleValue;
+  const urlLocaleMatch = pageUrl.pathname.match(urlLocaleMatcherRegex);
+
+  if (urlLocaleMatch && urlLocaleMatch[0]) {
+    currentLocaleValue = urlLocaleMatch[0].replace('/', '');
+  } else {
+    const cookieLocale = nextCookies.get('pz-locale')?.value;
+    if (
+      cookieLocale &&
+      Settings.localization.locales.find((l) => l.value === cookieLocale)
+    ) {
+      currentLocaleValue = cookieLocale;
+    }
+  }
+
   const currentLocale = Settings.localization.locales.find(
-    (locale) => locale.value === ServerVariables.locale
+    (locale) => locale.value === currentLocaleValue
   );
 
   const searchParams = new URLSearchParams(pageUrl.search);