@akinon/next 1.14.0 → 1.14.1

package/lib/cache.ts

@@ -1,215 +1,215 @@
-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) {
-    return '';
-  }
-  const sortedFilters = Object.entries(object).sort(([firstKey], [secondKey]) =>
-    firstKey.localeCompare(secondKey)
-  );
-
-  const cacheKey = Buffer.from(
-    JSON.stringify(Object.fromEntries(sortedFilters))
-  ).toString('base64');
-
-  return `_${encodeURIComponent(cacheKey)}`;
-};
-export const CacheKey = {
-  List: (searchParams: URLSearchParams, headers?: Record<string, string>) =>
-    `list_${encodeURIComponent(JSON.stringify(searchParams))}${hashCacheKey(
-      headers
-    )}`,
-  Category: (
-    pk: number,
-    searchParams?: URLSearchParams,
-    headers?: Record<string, string>
-  ) =>
-    `category_${pk}_${encodeURIComponent(
-      JSON.stringify(searchParams)
-    )}${hashCacheKey(headers)}`,
-  CategorySlug: (slug: string) => `category_${slug}`,
-  SpecialPage: (
-    pk: number,
-    searchParams: URLSearchParams,
-    headers?: Record<string, string>
-  ) =>
-    `special_page_${pk}_${encodeURIComponent(
-      JSON.stringify(searchParams)
-    )}${hashCacheKey(headers)}`,
-  Product: (pk: number, searchParams: URLSearchParams) =>
-    `product_${pk}_${encodeURIComponent(JSON.stringify(searchParams))}`,
-  GroupProduct: (pk: number, searchParams: URLSearchParams) =>
-    `group_product_${pk}_${encodeURIComponent(JSON.stringify(searchParams))}`,
-  FlatPage: (pk: number) => `flat_page_${pk}`,
-  LandingPage: (pk: number) => `landing_page_${pk}`,
-  Widget: (slug: string) => `widget_${slug}`,
-  PrettyUrl: (pathname: string) => `pretty_url_${pathname}`,
-  Menu: (depth: number, parent?: string) =>
-    `menu_${depth}${parent ? `_${parent}` : ''}`,
-  Seo: (url: string) => `seo_${url}`,
-  RootSeo: 'root_seo',
-  Form: (pk: number) => `form_${pk}`
-};
-
-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 async getClient() {
-    const { createClient } = await import('redis');
-    const redisUrl = `redis://${process.env.CACHE_HOST}:${
-      process.env.CACHE_PORT
-    }/${process.env.CACHE_BUCKET ?? '0'}`;
-
-    const client: RedisClientType = createClient({
-      url: redisUrl
-    });
-
-    client.on('error', (error) => {
-      logger.error('Redis client error', { redisUrl, error });
-    });
-
-    return client;
-  }
-
-  static async get(key: string) {
-    let value;
-    let client;
-
-    try {
-      client = await Cache.getClient();
-      await client.connect();
-      value = JSON.parse(await client.get(key));
-
-      logger.debug('Redis get success', { key });
-      logger.trace('Redis get success', { key, value });
-    } catch (error) {
-      logger.error('Redis get error', { key, error });
-    } finally {
-      await client?.disconnect();
-    }
-
-    return value;
-  }
-
-  static async set(key: string, value: string, expire?: number) {
-    let success = false;
-    let client;
-
-    try {
-      client = await Cache.getClient();
-      await client.connect();
-      await client.set(key, value, {
-        EX: expire
-      });
-
-      success = true;
-
-      logger.debug('Redis set success', { key });
-      logger.trace('Redis set success', { key, value });
-    } catch (error) {
-      logger.error('Redis set error', { key, error });
-    } finally {
-      await client?.disconnect();
-    }
-
-    return success;
-  }
-
-  static async wrap<T = any>(
-    key: string,
-    handler: () => Promise<T>,
-    options?: CacheOptions
-  ): Promise<T> {
-    const requiredVariables = [
-      process.env.CACHE_HOST,
-      process.env.CACHE_PORT,
-      process.env.CACHE_SECRET
-    ];
-
-    if (!requiredVariables.every((v) => v)) {
-      return await handler();
-    }
-
-    const defaultOptions: CacheOptions = {
-      cache: true,
-      expire: Settings.redis.defaultExpirationTime
-    };
-
-    const _options = Object.assign(defaultOptions, options);
-    const formattedKey = Cache.formatKey(key);
-
-    logger.debug('Cache wrap', { key, formattedKey, _options });
-
-    if (_options.cache) {
-      let cachedValue;
-
-      if (_options.useProxy) {
-        const body = new URLSearchParams();
-
-        body.append('key', formattedKey);
-
-        cachedValue = await Cache.proxyRequest('POST', body);
-        logger.debug('Cache proxy request success', { key });
-        logger.trace('Cache proxy request', { key, cachedValue });
-      } else {
-        cachedValue = await Cache.get(formattedKey);
-      }
-
-      if (cachedValue) {
-        return cachedValue;
-      }
-    }
-
-    logger.debug('Redis cache miss. Setting new value...', { key });
-
-    const data = await handler();
-
-    if (data && _options.cache) {
-      if (_options.useProxy) {
-        try {
-          const body = new URLSearchParams();
-
-          body.append('key', formattedKey);
-          body.append('value', JSON.stringify(data));
-          body.append(
-            'expire',
-            String(_options?.expire ?? Settings.redis.defaultExpirationTime)
-          );
-          await Cache.proxyRequest('PUT', body);
-
-          logger.debug('Cache proxy request', { key, body: body.toString() });
-        } catch (error) {
-          logger.error('Cache proxy error', error);
-        }
-      } else {
-        await Cache.set(formattedKey, JSON.stringify(data), _options?.expire);
-      }
-    }
-
-    return data;
-  }
-
-  static async proxyRequest(method: 'POST' | 'PUT', body: URLSearchParams) {
-    const response = await (
-      await fetch(Cache.PROXY_URL, {
-        method,
-        headers: {
-          authorization: process.env.CACHE_SECRET
-        },
-        body
-      })
-    ).json();
-
-    return response;
-  }
-}
+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) {
+    return '';
+  }
+  const sortedFilters = Object.entries(object).sort(([firstKey], [secondKey]) =>
+    firstKey.localeCompare(secondKey)
+  );
+
+  const cacheKey = Buffer.from(
+    JSON.stringify(Object.fromEntries(sortedFilters))
+  ).toString('base64');
+
+  return `_${encodeURIComponent(cacheKey)}`;
+};
+export const CacheKey = {
+  List: (searchParams: URLSearchParams, headers?: Record<string, string>) =>
+    `list_${encodeURIComponent(JSON.stringify(searchParams))}${hashCacheKey(
+      headers
+    )}`,
+  Category: (
+    pk: number,
+    searchParams?: URLSearchParams,
+    headers?: Record<string, string>
+  ) =>
+    `category_${pk}_${encodeURIComponent(
+      JSON.stringify(searchParams)
+    )}${hashCacheKey(headers)}`,
+  CategorySlug: (slug: string) => `category_${slug}`,
+  SpecialPage: (
+    pk: number,
+    searchParams: URLSearchParams,
+    headers?: Record<string, string>
+  ) =>
+    `special_page_${pk}_${encodeURIComponent(
+      JSON.stringify(searchParams)
+    )}${hashCacheKey(headers)}`,
+  Product: (pk: number, searchParams: URLSearchParams) =>
+    `product_${pk}_${encodeURIComponent(JSON.stringify(searchParams))}`,
+  GroupProduct: (pk: number, searchParams: URLSearchParams) =>
+    `group_product_${pk}_${encodeURIComponent(JSON.stringify(searchParams))}`,
+  FlatPage: (pk: number) => `flat_page_${pk}`,
+  LandingPage: (pk: number) => `landing_page_${pk}`,
+  Widget: (slug: string) => `widget_${slug}`,
+  PrettyUrl: (pathname: string) => `pretty_url_${pathname}`,
+  Menu: (depth: number, parent?: string) =>
+    `menu_${depth}${parent ? `_${parent}` : ''}`,
+  Seo: (url: string) => `seo_${url}`,
+  RootSeo: 'root_seo',
+  Form: (pk: number) => `form_${pk}`
+};
+
+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 async getClient() {
+    const { createClient } = await import('redis');
+    const redisUrl = `redis://${process.env.CACHE_HOST}:${
+      process.env.CACHE_PORT
+    }/${process.env.CACHE_BUCKET ?? '0'}`;
+
+    const client: RedisClientType = createClient({
+      url: redisUrl
+    });
+
+    client.on('error', (error) => {
+      logger.error('Redis client error', { redisUrl, error });
+    });
+
+    return client;
+  }
+
+  static async get(key: string) {
+    let value;
+    let client;
+
+    try {
+      client = await Cache.getClient();
+      await client.connect();
+      value = JSON.parse(await client.get(key));
+
+      logger.debug('Redis get success', { key });
+      logger.trace('Redis get success', { key, value });
+    } catch (error) {
+      logger.error('Redis get error', { key, error });
+    } finally {
+      await client?.disconnect();
+    }
+
+    return value;
+  }
+
+  static async set(key: string, value: string, expire?: number) {
+    let success = false;
+    let client;
+
+    try {
+      client = await Cache.getClient();
+      await client.connect();
+      await client.set(key, value, {
+        EX: expire
+      });
+
+      success = true;
+
+      logger.debug('Redis set success', { key });
+      logger.trace('Redis set success', { key, value });
+    } catch (error) {
+      logger.error('Redis set error', { key, error });
+    } finally {
+      await client?.disconnect();
+    }
+
+    return success;
+  }
+
+  static async wrap<T = any>(
+    key: string,
+    handler: () => Promise<T>,
+    options?: CacheOptions
+  ): Promise<T> {
+    const requiredVariables = [
+      process.env.CACHE_HOST,
+      process.env.CACHE_PORT,
+      process.env.CACHE_SECRET
+    ];
+
+    if (!requiredVariables.every((v) => v)) {
+      return await handler();
+    }
+
+    const defaultOptions: CacheOptions = {
+      cache: true,
+      expire: Settings.redis.defaultExpirationTime
+    };
+
+    const _options = Object.assign(defaultOptions, options);
+    const formattedKey = Cache.formatKey(key);
+
+    logger.debug('Cache wrap', { key, formattedKey, _options });
+
+    if (_options.cache) {
+      let cachedValue;
+
+      if (_options.useProxy) {
+        const body = new URLSearchParams();
+
+        body.append('key', formattedKey);
+
+        cachedValue = await Cache.proxyRequest('POST', body);
+        logger.debug('Cache proxy request success', { key });
+        logger.trace('Cache proxy request', { key, cachedValue });
+      } else {
+        cachedValue = await Cache.get(formattedKey);
+      }
+
+      if (cachedValue) {
+        return cachedValue;
+      }
+    }
+
+    logger.debug('Redis cache miss. Setting new value...', { key });
+
+    const data = await handler();
+
+    if (data && _options.cache) {
+      if (_options.useProxy) {
+        try {
+          const body = new URLSearchParams();
+
+          body.append('key', formattedKey);
+          body.append('value', JSON.stringify(data));
+          body.append(
+            'expire',
+            String(_options?.expire ?? Settings.redis.defaultExpirationTime)
+          );
+          await Cache.proxyRequest('PUT', body);
+
+          logger.debug('Cache proxy request', { key, body: body.toString() });
+        } catch (error) {
+          logger.error('Cache proxy error', error);
+        }
+      } else {
+        await Cache.set(formattedKey, JSON.stringify(data), _options?.expire);
+      }
+    }
+
+    return data;
+  }
+
+  static async proxyRequest(method: 'POST' | 'PUT', body: URLSearchParams) {
+    const response = await (
+      await fetch(Cache.PROXY_URL, {
+        method,
+        headers: {
+          authorization: process.env.CACHE_SECRET
+        },
+        body
+      })
+    ).json();
+
+    return response;
+  }
+}

package/localization/index.ts

@@ -1,5 +1,5 @@
-export enum LocaleUrlStrategy {
-  HideAllLocales = 'hide-all-locales',
-  HideDefaultLocale = 'hide-default-locale',
-  ShowAllLocales = 'show-all-locales'
-}
+export enum LocaleUrlStrategy {
+  HideAllLocales = 'hide-all-locales',
+  HideDefaultLocale = 'hide-default-locale',
+  ShowAllLocales = 'show-all-locales'
+}

package/localization/provider.tsx

@@ -1,58 +1,58 @@
-'use client';
-
-import React, { createContext } from 'react';
-import { getTranslateFn } from '../utils';
-import { useParams } from 'next/navigation';
-import { Currency, Locale } from '../types';
-import settings from 'settings';
-
-export const LocalizationContext = createContext(
-  {} as {
-    translate: (path: string) => string;
-    locale: string;
-    currency: string;
-    locales: Locale[];
-    currencies: Currency[];
-    defaultLocaleValue: string;
-    defaultCurrencyCode: string;
-    localeUrlStrategy?: string;
-  }
-);
-
-export default function LocalizationProvider({
-  children,
-  translations
-}: {
-  children: React.ReactNode;
-  translations: any;
-}) {
-  const {
-    locales,
-    currencies,
-    defaultLocaleValue,
-    defaultCurrencyCode,
-    localeUrlStrategy
-  } = settings.localization;
-
-  const { locale, currency } = useParams() as {
-    locale: string;
-    currency: string;
-  };
-
-  return (
-    <LocalizationContext.Provider
-      value={{
-        translate: (path: string) => getTranslateFn(path, translations),
-        locale,
-        currency,
-        locales,
-        currencies,
-        defaultLocaleValue,
-        defaultCurrencyCode,
-        localeUrlStrategy
-      }}
-    >
-      {children}
-    </LocalizationContext.Provider>
-  );
-}
+'use client';
+
+import React, { createContext } from 'react';
+import { getTranslateFn } from '../utils';
+import { useParams } from 'next/navigation';
+import { Currency, Locale } from '../types';
+import settings from 'settings';
+
+export const LocalizationContext = createContext(
+  {} as {
+    translate: (path: string) => string;
+    locale: string;
+    currency: string;
+    locales: Locale[];
+    currencies: Currency[];
+    defaultLocaleValue: string;
+    defaultCurrencyCode: string;
+    localeUrlStrategy?: string;
+  }
+);
+
+export default function LocalizationProvider({
+  children,
+  translations
+}: {
+  children: React.ReactNode;
+  translations: any;
+}) {
+  const {
+    locales,
+    currencies,
+    defaultLocaleValue,
+    defaultCurrencyCode,
+    localeUrlStrategy
+  } = settings.localization;
+
+  const { locale, currency } = useParams() as {
+    locale: string;
+    currency: string;
+  };
+
+  return (
+    <LocalizationContext.Provider
+      value={{
+        translate: (path: string) => getTranslateFn(path, translations),
+        locale,
+        currency,
+        locales,
+        currencies,
+        defaultLocaleValue,
+        defaultCurrencyCode,
+        localeUrlStrategy
+      }}
+    >
+      {children}
+    </LocalizationContext.Provider>
+  );
+}