@akinon/next 1.21.0-rc.0 → 1.21.0-rc.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @akinon/next
 
+## 1.21.0-rc.2
+
+### Minor Changes
+
+- 8075006: install plugins check the akinon version
+- 32668ed: ZERO-2296: Implement Checkout Provider Middleware and Enhancements
+- 29191da: ImageLoader supports crop none
+
+## 1.21.0-rc.1
+
+### Minor Changes
+
+- e910b228: ZERO-2421: Upgrade next version to 14.1.0
+- 1b4b0fa1: Redis connection change to connection pool
+
 ## 1.21.0-rc.0
 
 ### Minor Changes

package/api/auth.ts

@@ -220,6 +220,17 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
     pages: {
       signIn: ROUTES.AUTH,
       error: ROUTES.AUTH
+    },
+    cookies: {
+      sessionToken: {
+        name: `__Secure-next-auth.session-token`,
+        options: {
+          httpOnly: true,
+          sameSite: 'none',
+          path: '/',
+          secure: true
+        }
+      }
     }
   };
 };

package/bin/pz-install-plugins.js

@@ -1,39 +1,40 @@
-#!/usr/bin/env node
-
-const fs = require('fs');
 const path = require('path');
-const rootDir = path.resolve(process.cwd());
 const spawn = require('cross-spawn');
-const availablePlugins = require('../plugins');
-
-let plugins;
 
-try {
-  plugins = require(path.resolve(rootDir, './src/plugins.js'));
-} catch (error) {
-  console.error('No plugins.js file found, skipping plugin installation.');
-  process.exit(0);
+function findBaseDir() {
+  const insideNodeModules = __dirname.includes('node_modules');
+  return insideNodeModules
+    ? path.resolve(__dirname, '../../../../')
+    : path.resolve(__dirname, '../../../apps/projectzeronext');
 }
 
-let installCmd = [];
+const BASE_DIR = findBaseDir();
 
-availablePlugins
-  .filter((p) => plugins?.includes(p))
-  .forEach((name) => {
-    installCmd.push(`@akinon/${name}`);
-  });
+const getFullPath = (relativePath) => path.join(BASE_DIR, relativePath);
 
-spawn.sync('yarn', ['cache clean']);
+const packageJsonPath = getFullPath('package.json');
+const akinonPackageNumber = require(packageJsonPath).dependencies[
+  '@akinon/next'
+].replace('^', '');
+//just in case
 
-for (const plugin of availablePlugins) {
-  spawn.sync('yarn', ['remove', `@akinon/${plugin}`]);
-}
+const availablePlugins = require('../plugins');
+
+let installCmd = availablePlugins.map(
+  (name) => `@akinon/${name}@${akinonPackageNumber}`
+);
+
+spawn.sync('yarn', ['cache clean'], { stdio: 'inherit', cwd: BASE_DIR });
 
-if (
-  installCmd.length > 0 &&
-  !fs.existsSync(path.resolve(rootDir, '../../turbo.json'))
-) {
-  spawn.sync('yarn', ['add', ...installCmd, '--ignore-scripts'], {
-    stdio: 'inherit'
+availablePlugins.forEach((plugin) => {
+  spawn.sync('yarn', ['remove', `@akinon/${plugin}`], {
+    stdio: 'inherit',
+    cwd: BASE_DIR
   });
+});
+
+if (installCmd.length > 0) {
+  const yarnArgs = ['add', ...installCmd, '--ignore-scripts'];
+
+  spawn.sync('yarn', yarnArgs, { stdio: 'inherit', cwd: BASE_DIR });
 }

package/lib/cache.ts

@@ -1,3 +1,4 @@
+import { createPool, Pool } from 'generic-pool';
 import { RedisClientType } from 'redis';
 import Settings from 'settings';
 import { CacheOptions } from '../types';
@@ -64,21 +65,38 @@ export class Cache {
     );
   }
 
-  static async getClient() {
-    const { createClient } = await import('redis');
-    const redisUrl = `redis://${process.env.CACHE_HOST}:${
-      process.env.CACHE_PORT
-    }/${process.env.CACHE_BUCKET ?? '0'}`;
+  static clientPool: Pool<RedisClientType> = createPool(
+    {
+      create: async () => {
+        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
+        });
 
-    const client: RedisClientType = createClient({
-      url: redisUrl
-    });
+        client.on('error', (error) => {
+          logger.error('Redis client error', { redisUrl, error });
+        });
 
-    client.on('error', (error) => {
-      logger.error('Redis client error', { redisUrl, error });
-    });
+        await client.connect();
+
+        return client;
+      },
+      destroy: async (client: RedisClientType) => {
+        await client.disconnect();
+      }
+    },
+    {
+      max: 500,
+      min: 2
+    }
+  );
 
-    return client;
+  static async getClient() {
+    return await Cache.clientPool.acquire();
   }
 
   static async get(key: string) {
@@ -87,39 +105,49 @@ export class Cache {
 
     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 });
+      const response = await client.get(key);
+      if (response) {
+        value = JSON.parse(response);
+      } else {
+        value = null;
+      }
+      logger.debug('Redis get success', { key, value });
     } catch (error) {
       logger.error('Redis get error', { key, error });
+      value = null;
     } finally {
-      await client?.disconnect();
+      if (client) {
+        await Cache.clientPool.release(client);
+      }
     }
 
     return value;
   }
 
-  static async set(key: string, value: string, expire?: number) {
+  static async set(key: string, value: any, expire?: number) {
     let success = false;
     let client;
 
     try {
       client = await Cache.getClient();
-      await client.connect();
-      await client.set(key, value, {
-        EX: expire
-      });
+      const serializedValue =
+        typeof value === 'object' ? JSON.stringify(value) : value;
 
-      success = true;
+      if (expire) {
+        await client.set(key, serializedValue, { EX: expire });
+      } else {
+        await client.set(key, serializedValue);
+      }
 
-      logger.debug('Redis set success', { key });
-      logger.trace('Redis set success', { key, value });
+      success = true;
+      logger.debug('Redis set success', { key, value });
     } catch (error) {
       logger.error('Redis set error', { key, error });
+      success = false;
     } finally {
-      await client?.disconnect();
+      if (client) {
+        await Cache.clientPool.release(client);
+      }
     }
 
     return success;

package/middlewares/checkout-provider.ts

@@ -0,0 +1,88 @@
+import { NextFetchEvent, NextMiddleware, NextResponse } from 'next/server';
+import settings from 'settings';
+import { PzNextRequest } from '.';
+import logger from '../utils/log';
+import { urlLocaleMatcherRegex } from '../utils';
+import { getUrlPathWithLocale } from '../utils/localization';
+
+const withCheckoutProvider =
+  (middleware: NextMiddleware) =>
+  async (req: PzNextRequest, event: NextFetchEvent) => {
+    const url = req.nextUrl.clone();
+    const ip = req.headers.get('x-forwarded-for') ?? '';
+    const pathnameWithoutLocale = url.pathname.replace(
+      urlLocaleMatcherRegex,
+      ''
+    );
+    const searchParams = new URLSearchParams(url.search);
+
+    if (pathnameWithoutLocale.startsWith('/orders/checkout-provider/')) {
+      try {
+        const request = await fetch(
+          `${encodeURI(settings.commerceUrl)}${url.pathname.replace(
+            urlLocaleMatcherRegex,
+            ''
+          )}?${searchParams.toString()}`,
+          {
+            next: {
+              revalidate: 0
+            },
+            headers: {
+              Cookie: req.headers.get('cookie') || '',
+              Accept: 'application/json',
+              'X-Requested-With': 'XMLHttpRequest'
+            }
+          }
+        );
+
+        return NextResponse.json(await request.json());
+      } catch (error) {
+        logger.error('withCheckoutProvider error', {
+          error,
+          ip
+        });
+        return NextResponse.next();
+      }
+    }
+
+    if (pathnameWithoutLocale.startsWith('/orders/checkout-provider-cancel')) {
+      try {
+        const request = await fetch(
+          `${settings.commerceUrl}${pathnameWithoutLocale}${url.search}`,
+          {
+            redirect: 'manual',
+            next: {
+              revalidate: 0
+            },
+            headers: {
+              Cookie: req.headers.get('cookie') || ''
+            }
+          }
+        );
+
+        if (request.headers.get('location')) {
+          const location = request.headers.get('location');
+          const redirectUrl = new URL(
+            request.headers.get('location'),
+            location.startsWith('http') ? '' : process.env.NEXT_PUBLIC_URL
+          );
+
+          redirectUrl.pathname = getUrlPathWithLocale(
+            redirectUrl.pathname,
+            req.middlewareParams.rewrites.locale
+          );
+
+          return Response.redirect(redirectUrl.toString(), request.status);
+        }
+      } catch (error) {
+        logger.error('withCheckoutProvider error', {
+          error,
+          ip
+        });
+      }
+    }
+
+    return middleware(req, event);
+  };
+
+export default withCheckoutProvider;

package/middlewares/default.ts

@@ -2,6 +2,7 @@ import { NextFetchEvent, NextMiddleware, NextResponse } from 'next/server';
 import Settings from 'settings';
 import {
   PzNextRequest,
+  withCheckoutProvider,
   withCompleteGpay,
   withCompleteMasterpass,
   withOauthLogin,
@@ -16,6 +17,7 @@ import withLocale from './locale';
 import logger from '../utils/log';
 import { user } from '../data/urls';
 import { getUrlPathWithLocale } from '../utils/localization';
+import { ROUTES } from 'projectzeronext/src/routes';
 
 const withPzDefault =
   (middleware: NextMiddleware) =>
@@ -112,6 +114,36 @@ const withPzDefault =
       return NextResponse.redirect(redirectUrlWithLocale, 303);
     }
 
+    if (req.nextUrl.pathname.startsWith('/orders/checkout-provider/')) {
+      try {
+        const data = await req.json();
+
+        const request = await fetch(
+          `${encodeURI(Settings.commerceUrl)}${url.pathname.replace(
+            urlLocaleMatcherRegex,
+            ''
+          )}?${searchParams.toString()}`,
+          {
+            method: 'POST',
+            body: JSON.stringify(data),
+            next: {
+              revalidate: 0
+            },
+            headers: {
+              Cookie: req.headers.get('cookie') || '',
+              Accept: 'application/json',
+              'Content-Type': 'application/json',
+              'X-Requested-With': 'XMLHttpRequest'
+            }
+          }
+        );
+
+        return NextResponse.json(await request.json());
+      } catch (error) {
+        return NextResponse.redirect(ROUTES.BASKET);
+      }
+    }
+
     req.middlewareParams = {
       commerceUrl,
       rewrites: {}
@@ -123,64 +155,82 @@ const withPzDefault =
           withPrettyUrl(
             withRedirectionPayment(
               withThreeDRedirection(
-                withUrlRedirection(
-                  withCompleteGpay(
-                    withCompleteMasterpass(
-                      async (req: PzNextRequest, event: NextFetchEvent) => {
-                        let middlewareResult: NextResponse | void =
-                          NextResponse.next();
-
-                        try {
-                          const { locale, prettyUrl, currency } =
-                            req.middlewareParams.rewrites;
-                          const { defaultLocaleValue } = Settings.localization;
-                          const url = req.nextUrl.clone();
-                          const pathnameWithoutLocale = url.pathname.replace(
-                            urlLocaleMatcherRegex,
-                            ''
-                          );
-
-                          url.basePath = `/${commerceUrl}`;
-                          url.pathname = `/${
-                            locale.length ? `${locale}/` : ''
-                          }${currency}${prettyUrl ?? pathnameWithoutLocale}`;
-
-                          Settings.rewrites.forEach((rewrite) => {
-                            url.pathname = url.pathname.replace(
-                              rewrite.source,
-                              rewrite.destination
+                withCheckoutProvider(
+                  withUrlRedirection(
+                    withCompleteGpay(
+                      withCompleteMasterpass(
+                        async (req: PzNextRequest, event: NextFetchEvent) => {
+                          let middlewareResult: NextResponse | void =
+                            NextResponse.next();
+
+                          try {
+                            const { locale, prettyUrl, currency } =
+                              req.middlewareParams.rewrites;
+                            const { defaultLocaleValue } =
+                              Settings.localization;
+                            const url = req.nextUrl.clone();
+                            const pathnameWithoutLocale = url.pathname.replace(
+                              urlLocaleMatcherRegex,
+                              ''
                             );
-                          });
 
-                          middlewareResult = (await middleware(
-                            req,
-                            event
-                          )) as NextResponse | void;
+                            url.basePath = `/${commerceUrl}`;
+                            url.pathname = `/${
+                              locale.length ? `${locale}/` : ''
+                            }${currency}${prettyUrl ?? pathnameWithoutLocale}`;
+
+                            Settings.rewrites.forEach((rewrite) => {
+                              url.pathname = url.pathname.replace(
+                                rewrite.source,
+                                rewrite.destination
+                              );
+                            });
+
+                            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.
+                              if (
+                                middlewareResult.headers.get(
+                                  'pz-override-response'
+                                ) !== 'true'
+                              ) {
+                                middlewareResult.headers.set(
+                                  'x-middleware-rewrite',
+                                  url.href
+                                );
+                              }
+                            } else {
+                              // if middleware.ts doesn't have a return value.
+                              // e.g. NextResponse.next() doesn't exist in middleware.ts
+
+                              middlewareResult = NextResponse.rewrite(url);
+                            }
 
-                          // 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.
                             if (
-                              middlewareResult.headers.get(
-                                'pz-override-response'
-                              ) !== 'true'
+                              !url.pathname.startsWith(`/${currency}/orders`)
                             ) {
-                              middlewareResult.headers.set(
-                                'x-middleware-rewrite',
-                                url.href
+                              middlewareResult.cookies.set(
+                                'pz-locale',
+                                locale?.length > 0
+                                  ? locale
+                                  : defaultLocaleValue,
+                                {
+                                  sameSite: 'none',
+                                  secure: true,
+                                  expires: new Date(
+                                    Date.now() + 1000 * 60 * 60 * 24 * 7
+                                  ) // 7 days
+                                }
                               );
                             }
-                          } else {
-                            // if middleware.ts doesn't have a return value.
-                            // e.g. NextResponse.next() doesn't exist in middleware.ts
-
-                            middlewareResult = NextResponse.rewrite(url);
-                          }
-
-                          if (!url.pathname.startsWith(`/${currency}/orders`)) {
                             middlewareResult.cookies.set(
-                              'pz-locale',
-                              locale?.length > 0 ? locale : defaultLocaleValue,
+                              'pz-currency',
+                              currency,
                               {
                                 sameSite: 'none',
                                 secure: true,
@@ -189,74 +239,65 @@ const withPzDefault =
                                 ) // 7 days
                               }
                             );
-                          }
-                          middlewareResult.cookies.set(
-                            'pz-currency',
-                            currency,
-                            {
-                              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
-                          ) {
-                            logger.debug('Locale changed', {
-                              locale,
-                              oldLocale: req.cookies.get('pz-locale')?.value,
-                              ip
-                            });
-                          }
-
-                          middlewareResult.headers.set(
-                            'pz-url',
-                            req.nextUrl.toString()
-                          );
 
-                          if (req.cookies.get('pz-set-currency')) {
-                            middlewareResult.cookies.delete('pz-set-currency');
-                          }
+                            if (
+                              req.cookies.get('pz-locale') &&
+                              req.cookies.get('pz-locale').value !== locale
+                            ) {
+                              logger.debug('Locale changed', {
+                                locale,
+                                oldLocale: req.cookies.get('pz-locale')?.value,
+                                ip
+                              });
+                            }
 
-                          if (process.env.ACC_APP_VERSION) {
                             middlewareResult.headers.set(
-                              'acc-app-version',
-                              process.env.ACC_APP_VERSION
+                              'pz-url',
+                              req.nextUrl.toString()
                             );
-                          }
 
-                          // Set CSRF token if not set
-                          try {
-                            const url = `${Settings.commerceUrl}${user.csrfToken}`;
+                            if (req.cookies.get('pz-set-currency')) {
+                              middlewareResult.cookies.delete(
+                                'pz-set-currency'
+                              );
+                            }
 
-                            if (!req.cookies.get('csrftoken')) {
-                              const { csrf_token } = await (
-                                await fetch(url)
-                              ).json();
-                              middlewareResult.cookies.set(
-                                'csrftoken',
-                                csrf_token
+                            if (process.env.ACC_APP_VERSION) {
+                              middlewareResult.headers.set(
+                                'acc-app-version',
+                                process.env.ACC_APP_VERSION
                               );
                             }
+
+                            // Set CSRF token if not set
+                            try {
+                              const url = `${Settings.commerceUrl}${user.csrfToken}`;
+
+                              if (!req.cookies.get('csrftoken')) {
+                                const { csrf_token } = await (
+                                  await fetch(url)
+                                ).json();
+                                middlewareResult.cookies.set(
+                                  'csrftoken',
+                                  csrf_token
+                                );
+                              }
+                            } catch (error) {
+                              logger.error('CSRF Error', {
+                                error,
+                                ip
+                              });
+                            }
                           } catch (error) {
-                            logger.error('CSRF Error', {
+                            logger.error('withPzDefault Error', {
                               error,
                               ip
                             });
                           }
-                        } catch (error) {
-                          logger.error('withPzDefault Error', {
-                            error,
-                            ip
-                          });
-                        }
 
-                        return middlewareResult;
-                      }
+                          return middlewareResult;
+                        }
+                      )
                     )
                   )
                 )

package/middlewares/index.ts

@@ -7,6 +7,7 @@ import withOauthLogin from './oauth-login';
 import withUrlRedirection from './url-redirection';
 import withCompleteGpay from './complete-gpay';
 import withCompleteMasterpass from './complete-masterpass';
+import withCheckoutProvider from './checkout-provider';
 import { NextRequest } from 'next/server';
 
 export {
@@ -18,7 +19,8 @@ export {
   withOauthLogin,
   withUrlRedirection,
   withCompleteGpay,
-  withCompleteMasterpass
+  withCompleteMasterpass,
+  withCheckoutProvider
 };
 
 export interface PzNextRequest extends NextRequest {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.21.0-rc.0",
+  "version": "1.21.0-rc.2",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -14,13 +14,14 @@
     "pz-postdev": "bin/pz-postdev.js"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.46.0",
     "@opentelemetry/exporter-trace-otlp-http": "0.46.0",
     "@opentelemetry/resources": "1.19.0",
-    "@opentelemetry/semantic-conventions": "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",
     "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",
@@ -31,7 +32,7 @@
     "@typescript-eslint/eslint-plugin": "6.7.4",
     "@typescript-eslint/parser": "6.7.4",
     "eslint": "^8.14.0",
-    "@akinon/eslint-plugin-projectzero": "1.21.0-rc.0",
+    "@akinon/eslint-plugin-projectzero": "1.21.0-rc.2",
     "eslint-config-prettier": "8.5.0"
   }
 }

package/types/index.ts

@@ -198,7 +198,7 @@ export type CDNOptions = {
   width?: number;
   height?: number;
   quality?: number;
-  crop?: 'center' | 'top' | 'bottom' | 'left' | 'right';
+  crop?: 'center' | 'top' | 'bottom' | 'left' | 'right' | 'none';
   upscale?: boolean;
 };
 

package/utils/image-loader.ts

@@ -19,12 +19,19 @@ export const ImageLoader = ({
   aspectRatio
 }: ImageLoaderParams) => {
   if (src.match(/akinoncdn|akinoncloud|b-cdn\.net/)) {
-    return buildCDNUrl(src, {
+    const height =
+      fill && aspectRatio
+        ? parseInt(String(Number(width) / aspectRatio))
+        : undefined;
+
+    const config: CDNOptions = {
       width,
-      height: fill ? parseInt(String(Number(width) / aspectRatio)) : undefined,
+      height,
       quality,
-      crop
-    });
+      crop: crop !== 'none' ? crop : undefined
+    };
+
+    return buildCDNUrl(src, config);
   }
 
   return src;

package/with-pz-config.js

@@ -3,7 +3,7 @@ const deepMerge = require('./utils/deep-merge');
 
 /** @type {import('next').NextConfig} */
 const defaultConfig = {
-  experimental: { serverActions: true, instrumentationHook: true },
+  experimental: { instrumentationHook: true },
   reactStrictMode: true,
   transpilePackages: ['@akinon/next', ...pzPlugins.map((p) => `@akinon/${p}`)],
   skipTrailingSlashRedirect: true,