@akinon/next 1.48.0 → 1.50.0-rc.0

package/data/server/seo.ts

@@ -1,23 +1,15 @@
 import appFetch from '../../utils/app-fetch';
 import { Cache, CacheKey } from '../../lib/cache';
 import { misc } from '../../data/urls';
-import logger from '../../utils/log';
+import { ServerVariables } from '../../utils/server-variables';
 
-function getRootSeoDataHandler() {
-  return async function () {
-    let data = {};
-
-    try {
-      data = await appFetch<{ [key: string]: string }>(misc.cmsSeo('/'));
-    } catch (error) {
-      logger.error('Error while fetching root seo data', error);
-    }
-
-    return data;
-  };
+interface SeoDataParams {
+  url: string;
+  locale?: string;
+  currency?: string;
 }
 
-function getSeoDataHandler(url: string) {
+function getSeoDataHandler({ url, locale, currency }: SeoDataParams) {
   return async function () {
     let data = {} as {
       title: string;
@@ -27,7 +19,7 @@ function getSeoDataHandler(url: string) {
     };
 
     try {
-      data = await appFetch(misc.cmsSeo(url));
+      data = await appFetch({ url: misc.cmsSeo(url), locale, currency });
     } catch (error) {
       // logger.error('Error while fetching seo data', { url, error });
     }
@@ -36,13 +28,14 @@ function getSeoDataHandler(url: string) {
   };
 }
 
-/**
- * @deprecated Use getSeoData instead
- */
-export const getRootSeo = async () => {
-  return Cache.wrap(CacheKey.RootSeo, getRootSeoDataHandler());
-};
-
-export const getSeoData = async (url: string) => {
-  return Cache.wrap(CacheKey.Seo(url), getSeoDataHandler(url));
+export const getSeoData = async (
+  url,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency
+) => {
+  return Cache.wrap(
+    CacheKey.Seo(url),
+    locale,
+    getSeoDataHandler({ url, locale, currency })
+  );
 };

package/data/server/special-page.ts

@@ -4,25 +4,30 @@ import { GetCategoryResponse } from '../../types';
 import { generateCommerceSearchParams } from '../../utils';
 import appFetch from '../../utils/app-fetch';
 import header from '../../redux/reducers/header';
+import { ServerVariables } from '../../utils/server-variables';
 
 const getSpecialPageDataHandler = (
   pk: number,
+  locale: string,
+  currency: string,
   searchParams: URLSearchParams,
   headers?: Record<string, string>
 ) => {
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    const data: GetCategoryResponse = await appFetch(
-      `${category.getSpecialPageByPk(pk)}${params}`,
-      {
+    const data: GetCategoryResponse = await appFetch({
+      url: `${category.getSpecialPageByPk(pk)}${params}`,
+      locale,
+      currency,
+      init: {
         headers: {
           Accept: 'application/json',
           'Content-Type': 'application/json',
           ...(headers ?? {})
         }
       }
-    );
+    });
 
     return data;
   };
@@ -30,16 +35,21 @@ const getSpecialPageDataHandler = (
 
 export const getSpecialPageData = async ({
   pk,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency,
   searchParams,
   headers
 }: {
   pk: number;
+  locale?: string;
+  currency?: string;
   searchParams: URLSearchParams;
   headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
     CacheKey.SpecialPage(pk, searchParams, headers),
-    getSpecialPageDataHandler(pk, searchParams, headers),
+    locale,
+    getSpecialPageDataHandler(pk, locale, currency, searchParams, headers),
     {
       expire: 300
     }

package/data/server/widget.ts

@@ -3,25 +3,32 @@ import 'server-only';
 import { CacheOptions, WidgetResultType } from '../../types';
 import appFetch from '../../utils/app-fetch';
 import { widgets } from '../urls';
+import { ServerVariables } from '../../utils/server-variables';
 
-const getWidgetDataHandler = (slug: string) => async () => {
-  if (!slug) {
-    return null;
-  }
+const getWidgetDataHandler =
+  (slug: string, locale: string, currency: string) => async () => {
+    if (!slug) {
+      return null;
+    }
 
-  return await appFetch(widgets.getWidget(slug));
-};
+    return await appFetch({ url: widgets.getWidget(slug), locale, currency });
+  };
 
 export const getWidgetData = async <T>({
   slug,
+  locale = ServerVariables.locale,
+  currency = ServerVariables.currency,
   cacheOptions
 }: {
   slug: string;
+  locale?: string;
+  currency?: string;
   cacheOptions?: CacheOptions;
 }): Promise<WidgetResultType<T>> => {
   return Cache.wrap(
     CacheKey.Widget(slug),
-    getWidgetDataHandler(slug),
+    locale,
+    getWidgetDataHandler(slug, locale, currency),
     cacheOptions
   );
 };

package/data/urls.ts

@@ -83,6 +83,8 @@ export const checkout = {
   setDeliveryOption: '/orders/checkout/?page=DeliveryOptionSelectionPage',
   setAddresses: '/orders/checkout/?page=AddressSelectionPage',
   setShippingOption: '/orders/checkout/?page=ShippingOptionSelectionPage',
+  setDataSourceShippingOption:
+    '/orders/checkout/?page=DataSourceShippingOptionSelectionPage',
   setPaymentOption: '/orders/checkout/?page=PaymentOptionSelectionPage',
   setBinNumber: '/orders/checkout/?page=BinNumberPage',
   setMasterpassBinNumber: '/orders/checkout/?page=MasterpassBinNumberPage',
@@ -108,7 +110,10 @@ export const checkout = {
   completeLoyaltyPayment: '/orders/checkout/?page=LoyaltyPaymentSelectedPage',
   loyaltyMoneyUsage: '/orders/checkout/?page=LoyaltyMoneyUsagePage',
   setOrderNote: '/orders/checkout/?page=OrderNotePage',
-  couponSelectionPage: '/orders/checkout/?page=CouponSelectionPage'
+  couponSelectionPage: '/orders/checkout/?page=CouponSelectionPage',
+  setAttributeBasedShippingOption:
+    '/orders/checkout/?page=AttributeBasedShippingOptionSelectionPage',
+  deliveryBagsPage: '/orders/checkout/?page=DeliveryBagsPage'
 };
 
 export const flatpage = {
@@ -169,6 +174,8 @@ export const wishlist = {
       product_id ? product_id : ''
     }`,
   deleteCollection: (pk: number) => `/wishlists/user-collections/${pk}/`,
+  deleteCollectionItem: (pk: number) =>
+    `/wishlists/user-collection-items/${pk}/`,
   editCollection: (pk: number) => `/wishlists/user-collections/${pk}/`
 };
 
@@ -195,7 +202,10 @@ export const b2b = {
   draftBaskets: '/b2b/basket/drafts/',
   divisions: '/b2b/my-divisions/',
   myQuotations: '/b2b/my-quotations/',
-  loadBasket: (id) => `/b2b/basket/${id}/load/`
+  loadBasket: (id) => `/b2b/basket/${id}/load/`,
+  statusBasket: (cacheKey) => `/b2b/basket/?status_cache_key=${cacheKey}`,
+  basketExport: (queryString) => `/b2b/basket/?upload=true&${queryString}`,
+  basketImport: '/b2b/basket/bulk-import/'
 };
 
 export const widgets = {

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

@@ -2,7 +2,6 @@ import settings from 'settings';
 import { LayoutProps, PageProps, RootLayoutProps } from '../../types';
 import { redirect } from 'next/navigation';
 import { ServerVariables } from '../../utils/server-variables';
-import { getTranslations } from '../../utils/server-translation';
 import { ROUTES } from 'routes';
 import logger from '../../utils/log';
 
@@ -50,7 +49,11 @@ const addRootLayoutProps = async (componentProps: RootLayoutProps) => {
     return redirect(ROUTES.HOME);
   }
 
+  const { getTranslations } = settings.useOptimizedTranslations
+    ? require('translations')
+    : require('../../utils/server-translation');
   const translations = await getTranslations(params.locale);
+
   componentProps.translations = translations;
 
   const locale = settings.localization.locales.find(

package/hooks/index.ts

@@ -8,4 +8,5 @@ export * from './use-media-query';
 export * from './use-on-click-outside';
 export * from './use-mobile-iframe-handler';
 export * from './use-payment-options';
-export * from './use-pagination';
+export * from './use-pagination';
+export * from './use-message-listener';

package/hooks/use-message-listener.ts

@@ -0,0 +1,24 @@
+import { useEffect } from 'react';
+
+export const useMessageListener = () => {
+  useEffect(() => {
+    const handleMessage = (event: MessageEvent) => {
+      if (event.origin !== window.location.origin) {
+        return;
+      }
+
+      if (event.data && typeof event.data === 'string') {
+        const messageData = JSON.parse(event.data);
+        if (messageData?.url) {
+          window.location.href = messageData.url;
+        }
+      }
+    };
+
+    window.addEventListener('message', handleMessage);
+
+    return () => {
+      window.removeEventListener('message', handleMessage);
+    };
+  }, []);
+};

package/hooks/use-pagination.ts

@@ -116,7 +116,7 @@ export default function usePagination(
       urlSearchParams.set('page', (Number(state.page) - 1).toString());
       return `${pathname}?${urlSearchParams.toString()}`;
     }
-    return '#';
+    return null;
   }, [state.page, pathname, urlSearchParams]);
 
   const next = useMemo(() => {
@@ -124,7 +124,7 @@ export default function usePagination(
       urlSearchParams.set('page', (Number(state.page) + 1).toString());
       return `${pathname}?${urlSearchParams.toString()}`;
     }
-    return '#';
+    return null;
   }, [state.page, state.last, pathname, urlSearchParams]);
 
   return {

package/hooks/use-payment-options.ts

@@ -18,7 +18,8 @@ export const usePaymentOptions = () => {
     pay_on_delivery: 'pz-pay-on-delivery',
     bkm_express: 'pz-bkm',
     credit_payment: 'pz-credit-payment',
-    masterpass: 'pz-masterpass'
+    masterpass: 'pz-masterpass',
+    gpay: 'pz-gpay'
   };
 
   const isInitialTypeIncluded = (type: string) => initialTypes.has(type);

package/lib/cache-handler.mjs

@@ -0,0 +1,33 @@
+import { CacheHandler } from '@neshca/cache-handler';
+import createLruHandler from '@neshca/cache-handler/local-lru';
+import createRedisHandler from '@neshca/cache-handler/redis-stack';
+import { createClient } from 'redis';
+
+CacheHandler.onCreation(async () => {
+  const redisUrl = `redis://${process.env.CACHE_HOST}:${
+    process.env.CACHE_PORT
+  }/${process.env.CACHE_BUCKET ?? '0'}`;
+
+  const client = createClient({
+    url: redisUrl
+  });
+
+  client.on('error', (error) => {
+    console.error('Redis client error', { redisUrl, error });
+  });
+
+  await client.connect();
+
+  const redisHandler = await createRedisHandler({
+    client,
+    timeoutMs: 5000
+  });
+
+  const localHandler = createLruHandler();
+
+  return {
+    handlers: [redisHandler, localHandler]
+  };
+});
+
+export default CacheHandler;

package/lib/cache.ts

@@ -3,7 +3,6 @@ import { RedisClientType } from 'redis';
 import Settings from 'settings';
 import { CacheOptions } from '../types';
 import logger from '../utils/log';
-import { ServerVariables } from '../utils/server-variables';
 
 const hashCacheKey = (object?: Record<string, string>) => {
   if (!object) {
@@ -59,10 +58,8 @@ export const CacheKey = {
 export class Cache {
   static PROXY_URL = `${process.env.NEXT_PUBLIC_URL}/api/cache`;
 
-  static formatKey(key: string) {
-    return encodeURIComponent(
-      `${Settings.commerceUrl}_${ServerVariables.locale}_${key}`
-    );
+  static formatKey(key: string, locale: string) {
+    return encodeURIComponent(`${Settings.commerceUrl}_${locale}_${key}`);
   }
 
   static clientPool: Pool<RedisClientType> = createPool(
@@ -155,9 +152,14 @@ export class Cache {
 
   static async wrap<T = any>(
     key: string,
+    locale: string,
     handler: () => Promise<T>,
     options?: CacheOptions
   ): Promise<T> {
+    if (Settings.usePrettyUrlRoute) {
+      return await handler();
+    }
+
     const requiredVariables = [
       process.env.CACHE_HOST,
       process.env.CACHE_PORT,
@@ -174,7 +176,7 @@ export class Cache {
     };
 
     const _options = Object.assign(defaultOptions, options);
-    const formattedKey = Cache.formatKey(key);
+    const formattedKey = Cache.formatKey(key, locale);
 
     logger.debug('Cache wrap', { key, formattedKey, _options });
 

package/middlewares/default.ts

@@ -69,6 +69,10 @@ const withPzDefault =
       return NextResponse.json({ status: 'ok' });
     }
 
+    if (url.pathname.startsWith('/metrics')) {
+      return new NextResponse(null, { status: 200 });
+    }
+
     if (req.nextUrl.pathname.startsWith('/.well-known')) {
       const url = new URL(`${Settings.commerceUrl}${req.nextUrl.pathname}`);
       const req_ = await fetch(url.toString());
@@ -84,14 +88,44 @@ const withPzDefault =
       req.nextUrl.pathname.includes('/orders/hooks/') ||
       req.nextUrl.pathname.includes('/orders/checkout-with-token/')
     ) {
-      return NextResponse.rewrite(
+      const segment = url.searchParams.get('segment');
+      const currency = url.searchParams.get('currency')?.toLowerCase();
+
+      const headers = {};
+
+      if (segment) {
+        headers['X-Segment-Id'] = segment;
+      }
+
+      if (currency) {
+        headers['x-currency'] = currency;
+      }
+
+      const response = NextResponse.rewrite(
         new URL(
           `${Settings.commerceUrl}${req.nextUrl.pathname.replace(
             urlLocaleMatcherRegex,
             ''
           )}`
-        )
+        ),
+        {
+          headers
+        }
       );
+
+      if (segment) {
+        response.cookies.set('pz-segment', segment);
+      }
+
+      if (currency) {
+        response.cookies.set('pz-currency', currency, {
+          sameSite: 'none',
+          secure: true,
+          expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 7) // 7 days
+        });
+      }
+
+      return response;
     }
 
     if (req.nextUrl.pathname.startsWith('/orders/redirection/')) {
@@ -185,10 +219,41 @@ const withPzDefault =
                               ''
                             );
 
+                            middlewareResult = (await middleware(
+                              req,
+                              event
+                            )) as NextResponse | void;
+
+                            let customRewriteUrlDiff = '';
+
+                            if (
+                              middlewareResult instanceof NextResponse &&
+                              middlewareResult.headers.get(
+                                'pz-override-response'
+                              ) &&
+                              middlewareResult.headers.get(
+                                'x-middleware-rewrite'
+                              )
+                            ) {
+                              const rewriteUrl = new URL(
+                                middlewareResult.headers.get(
+                                  'x-middleware-rewrite'
+                                )
+                              );
+                              const originalUrl = new URL(req.url);
+                              customRewriteUrlDiff =
+                                rewriteUrl.pathname.replace(
+                                  originalUrl.pathname,
+                                  ''
+                                );
+                            }
+
                             url.basePath = `/${commerceUrl}`;
                             url.pathname = `/${
                               locale.length ? `${locale}/` : ''
-                            }${currency}${prettyUrl ?? pathnameWithoutLocale}`;
+                            }${currency}/${customRewriteUrlDiff}${
+                              prettyUrl ?? pathnameWithoutLocale
+                            }`.replace(/\/+/g, '/');
 
                             if (
                               !req.middlewareParams.found &&
@@ -203,6 +268,20 @@ const withPzDefault =
                               );
                             }
 
+                            if (
+                              Settings.usePrettyUrlRoute &&
+                              url.searchParams.toString().length > 0 &&
+                              !Object.entries(ROUTES).find(([, value]) =>
+                                new RegExp(`^${value}/?$`).test(
+                                  pathnameWithoutLocale
+                                )
+                              )
+                            ) {
+                              url.pathname =
+                                url.pathname +
+                                `searchparams|${url.searchParams.toString()}`;
+                            }
+
                             Settings.rewrites.forEach((rewrite) => {
                               url.pathname = url.pathname.replace(
                                 rewrite.source,
@@ -210,11 +289,6 @@ const withPzDefault =
                               );
                             });
 
-                            middlewareResult = (await middleware(
-                              req,
-                              event
-                            )) as NextResponse | void;
-
                             // if middleware.ts has a return value for current url
                             if (middlewareResult instanceof NextResponse) {
                               // pz-override-response header is used to prevent 404 page for custom responses.
@@ -227,6 +301,15 @@ const withPzDefault =
                                   'x-middleware-rewrite',
                                   url.href
                                 );
+                              } else if (
+                                middlewareResult.headers.get(
+                                  'x-middleware-rewrite'
+                                ) &&
+                                middlewareResult.headers.get(
+                                  'pz-override-response'
+                                ) === 'true'
+                              ) {
+                                middlewareResult = NextResponse.rewrite(url);
                               }
                             } else {
                               // if middleware.ts doesn't have a return value.

package/middlewares/pretty-url.ts

@@ -43,9 +43,14 @@ const resolvePrettyUrlHandler =
     return prettyUrlResult;
   };
 
-const resolvePrettyUrl = async (pathname: string, ip: string | null) => {
+const resolvePrettyUrl = async (
+  pathname: string,
+  locale: string,
+  ip: string | null
+) => {
   return Cache.wrap(
     CacheKey.PrettyUrl(pathname),
+    locale,
     resolvePrettyUrlHandler(pathname, ip),
     {
       useProxy: true
@@ -56,6 +61,10 @@ const resolvePrettyUrl = async (pathname: string, ip: string | null) => {
 const withPrettyUrl =
   (middleware: NextMiddleware) =>
   async (req: PzNextRequest, event: NextFetchEvent) => {
+    if (Settings.usePrettyUrlRoute) {
+      return middleware(req, event);
+    }
+
     const url = req.nextUrl.clone();
     const matchedLanguagePrefix = url.pathname.match(
       urlLocaleMatcherRegex
@@ -84,6 +93,7 @@ const withPrettyUrl =
       )
         ? url.pathname
         : prettyUrlPathname,
+      matchedLanguagePrefix,
       ip
     );
 

package/middlewares/url-redirection.ts

@@ -11,6 +11,10 @@ import { ROUTES } from 'routes';
 const withUrlRedirection =
   (middleware: NextMiddleware) =>
   async (req: PzNextRequest, event: NextFetchEvent) => {
+    if (settings.usePrettyUrlRoute) {
+      return middleware(req, event);
+    }
+
     const url = req.nextUrl.clone();
     const ip = req.headers.get('x-forwarded-for') ?? '';
     const pathnameWithoutLocale = url.pathname.replace(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.48.0",
+  "version": "1.50.0-rc.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -20,21 +20,22 @@
     "@opentelemetry/sdk-trace-node": "1.19.0",
     "@opentelemetry/semantic-conventions": "1.19.0",
     "@reduxjs/toolkit": "1.9.7",
+    "@neshca/cache-handler": "1.5.1",
     "cross-spawn": "7.0.3",
     "generic-pool": "3.9.0",
     "react-redux": "8.1.3",
     "react-string-replace": "1.1.1",
-    "redis": "4.5.1",
-    "semver": "7.5.4",
+    "redis": "4.6.13",
+    "semver": "7.6.2",
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
+    "@akinon/eslint-plugin-projectzero": "1.50.0-rc.0",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",
     "@typescript-eslint/parser": "6.7.4",
     "eslint": "^8.14.0",
-    "@akinon/eslint-plugin-projectzero": "1.48.0",
     "eslint-config-prettier": "8.5.0"
   }
 }

package/plugins.d.ts

@@ -12,6 +12,7 @@ declare module '@akinon/pz-masterpass/src/utils' {
 declare module '@akinon/pz-masterpass/src/redux/reducer' {
   export const setError: any;
   export const setOtpModalVisible: any;
+  export const setCvcRequired: any;
 }
 
 declare module '@akinon/pz-otp' {