@akinon/next 1.96.0-snapshot-ZERO-35861-20250908151109 → 1.96.0-snapshot-ZERO-3620-20250915165755

package/lib/cache.ts

@@ -3,65 +3,6 @@ import { RedisClientType } from 'redis';
 import Settings from 'settings';
 import { CacheOptions } from '../types';
 import logger from '../utils/log';
-const CACHE_VERSION = 'v2';
-
-const compressData = async (data: string): Promise<Uint8Array> => {
-  const stream = new CompressionStream('gzip');
-  const writer = stream.writable.getWriter();
-  const reader = stream.readable.getReader();
-
-  writer.write(new TextEncoder().encode(data));
-  writer.close();
-
-  const chunks: Uint8Array[] = [];
-  let done = false;
-
-  while (!done) {
-    const { value, done: readerDone } = await reader.read();
-    done = readerDone;
-    if (value) chunks.push(value);
-  }
-
-  const totalLength = chunks.reduce((sum, chunk) => sum + chunk.length, 0);
-  const result = new Uint8Array(totalLength);
-  let offset = 0;
-
-  for (const chunk of chunks) {
-    result.set(chunk, offset);
-    offset += chunk.length;
-  }
-
-  return result;
-};
-
-const decompressData = async (compressed: Uint8Array): Promise<string> => {
-  const stream = new DecompressionStream('gzip');
-  const writer = stream.writable.getWriter();
-  const reader = stream.readable.getReader();
-
-  writer.write(compressed);
-  writer.close();
-
-  const chunks: Uint8Array[] = [];
-  let done = false;
-
-  while (!done) {
-    const { value, done: readerDone } = await reader.read();
-    done = readerDone;
-    if (value) chunks.push(value);
-  }
-
-  const totalLength = chunks.reduce((sum, chunk) => sum + chunk.length, 0);
-  const result = new Uint8Array(totalLength);
-  let offset = 0;
-
-  for (const chunk of chunks) {
-    result.set(chunk, offset);
-    offset += chunk.length;
-  }
-
-  return new TextDecoder().decode(result);
-};
 
 const hashCacheKey = (object?: Record<string, string>) => {
   if (!object) {
@@ -119,32 +60,8 @@ export const CacheKey = {
 export class Cache {
   static PROXY_URL = `${process.env.NEXT_PUBLIC_URL}/api/cache`;
 
-  private static serializeValue(value: any): string {
-    return typeof value === 'object' ? JSON.stringify(value) : String(value);
-  }
-
-  private static validateKey(key: string): boolean {
-    return !(!key || key.trim() === '');
-  }
-
-  private static validateKeyValuePairs(keyValuePairs: Record<string, any>): {
-    isValid: boolean;
-    invalidKeys: string[];
-  } {
-    if (!keyValuePairs || Object.keys(keyValuePairs).length === 0) {
-      return { isValid: false, invalidKeys: [] };
-    }
-
-    const invalidKeys = Object.keys(keyValuePairs).filter(
-      (key) => !this.validateKey(key)
-    );
-    return { isValid: invalidKeys.length === 0, invalidKeys };
-  }
-
   static formatKey(key: string, locale: string) {
-    return encodeURIComponent(
-      `${CACHE_VERSION}_${Settings.commerceUrl}_${locale}_${key}`
-    );
+    return encodeURIComponent(`${Settings.commerceUrl}_${locale}_${key}`);
   }
 
   static clientPool: Pool<RedisClientType> = createPool(
@@ -181,9 +98,9 @@ export class Cache {
     return await Cache.clientPool.acquire();
   }
 
-  static async get(key: string): Promise<any> {
-    let value: any;
-    let client: RedisClientType | undefined;
+  static async get(key: string) {
+    let value;
+    let client;
 
     try {
       client = await Cache.getClient();
@@ -193,7 +110,9 @@ export class Cache {
       } else {
         value = null;
       }
+      logger.debug('Redis get success', { key, value });
     } catch (error) {
+      logger.error('Redis get error', { key, error });
       value = null;
     } finally {
       if (client) {
@@ -204,13 +123,14 @@ export class Cache {
     return value;
   }
 
-  static async set(key: string, value: any, expire?: number): Promise<boolean> {
+  static async set(key: string, value: any, expire?: number) {
     let success = false;
-    let client: RedisClientType | undefined;
+    let client;
 
     try {
       client = await Cache.getClient();
-      const serializedValue = Cache.serializeValue(value);
+      const serializedValue =
+        typeof value === 'object' ? JSON.stringify(value) : value;
 
       if (expire) {
         await client.set(key, serializedValue, { EX: expire });
@@ -219,7 +139,9 @@ export class Cache {
       }
 
       success = true;
+      logger.debug('Redis set success', { key, value });
     } catch (error) {
+      logger.error('Redis set error', { key, error });
       success = false;
     } finally {
       if (client) {
@@ -248,8 +170,7 @@ export class Cache {
 
     const defaultOptions: CacheOptions = {
       cache: true,
-      expire: Settings.redis.defaultExpirationTime,
-      compressed: process.env.CACHE_COMPRESSION_ENABLED !== 'false'
+      expire: Settings.redis.defaultExpirationTime
     };
 
     const _options = Object.assign(defaultOptions, options);
@@ -259,22 +180,21 @@ export class Cache {
       _options.expire = 120;
     }
 
+    logger.debug('Cache wrap', { key, formattedKey, _options });
+
     if (_options.cache) {
-      let cachedValue: any;
+      let cachedValue;
 
       if (_options.useProxy) {
         const body = new URLSearchParams();
 
         body.append('key', formattedKey);
-        if (_options.compressed) {
-          body.append('compressed', 'true');
-        }
 
         cachedValue = await Cache.proxyRequest('POST', body);
+        logger.debug('Cache proxy request success', { key });
+        logger.trace('Cache proxy request', { key, cachedValue });
       } else {
-        cachedValue = _options.compressed
-          ? await Cache.getCompressed(formattedKey)
-          : await Cache.get(formattedKey);
+        cachedValue = await Cache.get(formattedKey);
       }
 
       if (cachedValue) {
@@ -282,6 +202,8 @@ export class Cache {
       }
     }
 
+    logger.debug('Redis cache miss. Setting new value...', { key });
+
     const data = await handler();
 
     if (data && _options.cache) {
@@ -295,19 +217,14 @@ export class Cache {
             'expire',
             String(_options?.expire ?? Settings.redis.defaultExpirationTime)
           );
-          if (_options.compressed) {
-            body.append('compressed', 'true');
-          }
           await Cache.proxyRequest('PUT', body);
+
+          logger.debug('Cache proxy request', { key, body: body.toString() });
         } catch (error) {
           logger.error('Cache proxy error', error);
         }
       } else {
-        if (_options.compressed) {
-          await Cache.setCompressed(formattedKey, data, _options?.expire);
-        } else {
-          await Cache.set(formattedKey, JSON.stringify(data), _options?.expire);
-        }
+        await Cache.set(formattedKey, JSON.stringify(data), _options?.expire);
       }
     }
 
@@ -319,7 +236,7 @@ export class Cache {
       await fetch(Cache.PROXY_URL, {
         method,
         headers: {
-          authorization: process.env.CACHE_SECRET || ''
+          authorization: process.env.CACHE_SECRET
         },
         body
       })
@@ -327,148 +244,4 @@ export class Cache {
 
     return response;
   }
-
-  static async mset(
-    keyValuePairs: Record<string, any>,
-    expire?: number
-  ): Promise<boolean> {
-    const validation = Cache.validateKeyValuePairs(keyValuePairs);
-    if (!validation.isValid) {
-      if (validation.invalidKeys.length > 0) {
-        logger.error('Invalid keys in mset', {
-          invalidKeys: validation.invalidKeys
-        });
-      } else {
-        logger.warn('mset called with empty keyValuePairs');
-      }
-      return false;
-    }
-
-    let success = false;
-    let client: RedisClientType | undefined;
-
-    try {
-      client = await Cache.getClient();
-      const pipeline = client.multi();
-
-      Object.entries(keyValuePairs).forEach(([key, value]) => {
-        const serializedValue = Cache.serializeValue(value);
-        if (expire) {
-          pipeline.set(key, serializedValue, { EX: expire });
-        } else {
-          pipeline.set(key, serializedValue);
-        }
-      });
-
-      const results = await pipeline.exec();
-
-      const failures =
-        results?.filter((result) => result instanceof Error) || [];
-
-      if (failures.length > 0) {
-        success = false;
-      } else {
-        success = true;
-      }
-    } catch (error) {
-      success = false;
-    } finally {
-      if (client) {
-        await Cache.clientPool.release(client);
-      }
-    }
-
-    return success;
-  }
-
-  static async setCompressed(
-    key: string,
-    value: any,
-    expire?: number
-  ): Promise<boolean> {
-    if (!Cache.validateKey(key)) {
-      return false;
-    }
-
-    let success = false;
-    let client: RedisClientType | undefined;
-
-    try {
-      client = await Cache.getClient();
-      const serializedValue = Cache.serializeValue(value);
-
-      try {
-        const compressed = await compressData(serializedValue);
-        const compressedBase64 = Buffer.from(compressed).toString('base64');
-
-        if (expire) {
-          await client.set(key, compressedBase64, { EX: expire });
-        } else {
-          await client.set(key, compressedBase64);
-        }
-
-        success = true;
-      } catch (compressionError) {
-        if (expire) {
-          await client.set(key, serializedValue, { EX: expire });
-        } else {
-          await client.set(key, serializedValue);
-        }
-
-        success = true;
-      }
-    } catch (error) {
-      success = false;
-    } finally {
-      if (client) {
-        await Cache.clientPool.release(client);
-      }
-    }
-
-    return success;
-  }
-
-  static async getCompressed(key: string): Promise<unknown> {
-    if (!Cache.validateKey(key)) {
-      return null;
-    }
-
-    let value: unknown;
-    let client: RedisClientType | undefined;
-
-    try {
-      client = await Cache.getClient();
-      const compressed = await client.get(key);
-
-      if (compressed) {
-        const compressedBuffer = Buffer.from(compressed, 'base64');
-
-        try {
-          const decompressedString = await decompressData(
-            new Uint8Array(compressedBuffer)
-          );
-          value = JSON.parse(decompressedString);
-          return value;
-        } catch (decompressionError) {
-          try {
-            const rawString = compressed;
-            const parsedData = JSON.parse(rawString);
-            return parsedData;
-          } catch (jsonError) {
-            return null;
-          }
-        }
-      } else {
-        value = null;
-      }
-    } catch (error) {
-      value = null;
-    } finally {
-      if (client) {
-        await Cache.clientPool.release(client);
-      }
-    }
-
-    return value;
-  }
 }

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/default.ts

@@ -302,19 +302,6 @@ const withPzDefault =
                                     )}`;
                                 }
 
-                                if (
-                                  !req.middlewareParams.found &&
-                                  Settings.customNotFoundEnabled
-                                ) {
-                                  const pathname = url.pathname
-                                    .replace(/\/+$/, '')
-                                    .split('/');
-                                  url.pathname = url.pathname.replace(
-                                    pathname.pop(),
-                                    'pz-not-found'
-                                  );
-                                }
-
                                 Settings.rewrites.forEach((rewrite) => {
                                   url.pathname = url.pathname.replace(
                                     rewrite.source,
@@ -352,6 +339,24 @@ const withPzDefault =
                                   middlewareResult = NextResponse.rewrite(url);
                                 }
 
+                                if (
+                                  !req.middlewareParams.found &&
+                                  Settings.customNotFoundEnabled
+                                ) {
+                                  const pathSegments = url.pathname
+                                    .replace(/\/+$/, '')
+                                    .split('/');
+                                  if (pathSegments.length >= 3) {
+                                    url.pathname = `/${pathSegments[1]}/${pathSegments[2]}/pz-not-found`;
+                                  } else {
+                                    url.pathname = '/pz-not-found';
+                                  }
+
+                                  middlewareResult = NextResponse.rewrite(url, {
+                                    status: 404
+                                  });
+                                }
+
                                 const { localeUrlStrategy } =
                                   Settings.localization;
 
@@ -401,6 +406,38 @@ const withPzDefault =
                                   }
                                 );
 
+                                if (
+                                  !url.pathname.startsWith(
+                                    `/${currency}/orders`
+                                  )
+                                ) {
+                                  const currentCookieLocale =
+                                    req.cookies.get('pz-locale')?.value;
+
+                                  const urlHasExplicitLocale =
+                                    url.pathname.match(urlLocaleMatcherRegex);
+                                  const shouldUpdateCookie =
+                                    !currentCookieLocale ||
+                                    urlHasExplicitLocale;
+
+                                  if (shouldUpdateCookie) {
+                                    middlewareResult.cookies.set(
+                                      'pz-locale',
+                                      locale?.length > 0
+                                        ? locale
+                                        : defaultLocaleValue,
+                                      {
+                                        domain: rootHostname,
+                                        sameSite: 'none',
+                                        secure: true,
+                                        expires: new Date(
+                                          Date.now() + 1000 * 60 * 60 * 24 * 7
+                                        ) // 7 days
+                                      }
+                                    );
+                                  }
+                                }
+
                                 if (
                                   req.cookies.get('pz-locale') &&
                                   req.cookies.get('pz-locale').value !== locale

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/pretty-url.ts

@@ -53,8 +53,7 @@ const resolvePrettyUrl = async (
     locale,
     resolvePrettyUrlHandler(pathname, ip),
     {
-      useProxy: true,
-      compressed: true
+      useProxy: true
     }
   );
 };

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

@@ -149,7 +149,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/middlewares/url-redirection.ts

@@ -4,6 +4,7 @@ import { PzNextRequest } from '.';
 import logger from '../utils/log';
 import { urlLocaleMatcherRegex } from '../utils';
 import { getUrlPathWithLocale } from '../utils/localization';
+import { shouldIgnoreRedirect } from '../utils/redirect-ignore';
 import { ROUTES } from 'routes';
 
 // This middleware is used to handle url redirections set in Omnitron
@@ -60,20 +61,13 @@ const withUrlRedirection =
 
         const setCookies = request.headers.getSetCookie();
 
-        if (settings.commerceRedirectionIgnoreList) {
-          const shouldIgnoreRedirect =
-            settings.commerceRedirectionIgnoreList.some((ignorePath) =>
-              redirectUrl.pathname.startsWith(
-                getUrlPathWithLocale(
-                  ignorePath,
-                  req.middlewareParams.rewrites.locale
-                )
-              )
-            );
-
-          if (shouldIgnoreRedirect) {
-            return middleware(req, event);
-          }
+        if (
+          shouldIgnoreRedirect(
+            url.pathname,
+            req.middlewareParams.rewrites.locale
+          )
+        ) {
+          return middleware(req, event);
         }
 
         const response = NextResponse.redirect(redirectUrl.toString(), {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.96.0-snapshot-ZERO-35861-20250908151109",
+  "version": "1.96.0-snapshot-ZERO-3620-20250915165755",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -17,14 +17,13 @@
     "test": "jest"
   },
   "dependencies": {
-    "@mongodb-js/zstd": "^2.0.1",
-    "@neshca/cache-handler": "1.9.0",
     "@opentelemetry/exporter-trace-otlp-http": "0.46.0",
     "@opentelemetry/resources": "1.19.0",
     "@opentelemetry/sdk-node": "0.46.0",
     "@opentelemetry/sdk-trace-node": "1.19.0",
     "@opentelemetry/semantic-conventions": "1.19.0",
     "@reduxjs/toolkit": "1.9.7",
+    "@neshca/cache-handler": "1.9.0",
     "@sentry/nextjs": "9.5.0",
     "cross-spawn": "7.0.3",
     "generic-pool": "3.9.0",
@@ -35,7 +34,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.96.0-snapshot-ZERO-35861-20250908151109",
+    "@akinon/eslint-plugin-projectzero": "1.96.0-snapshot-ZERO-3620-20250915165755",
     "@babel/core": "7.26.10",
     "@babel/preset-env": "7.26.9",
     "@babel/preset-typescript": "7.27.0",

package/plugins.d.ts

@@ -38,3 +38,11 @@ declare module '@akinon/pz-iyzico-saved-card' {
 declare module '@akinon/pz-apple-pay' {}
 
 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/plugins.js

@@ -16,5 +16,7 @@ module.exports = [
   'pz-tabby-extension',
   'pz-apple-pay',
   'pz-tamara-extension',
-  'pz-flow-payment'
+  'pz-hepsipay',
+  'pz-flow-payment',
+  'pz-similar-products'
 ];

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;
   };
 }