@akinon/next 1.20.0 → 1.21.0-rc.1

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @akinon/next
 
+## 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
+
+- 26a74c9: ZERO-2436: Add getCoupons and setCoupon API endpoints
+
 ## 1.20.0
 
 ### Minor Changes

package/data/client/checkout.ts

@@ -177,6 +177,27 @@ export const checkoutApi = api.injectEndpoints({
           responseType: 'text'
         })
     }),
+    getCoupons: build.query<CheckoutResponse, void>({
+      query: () => ({
+        url: buildClientRequestUrl(checkout.couponSelectionPage)
+      })
+    }),
+
+    setCoupon: build.mutation<CheckoutResponse, { pk: number; action: string }>(
+      {
+        query: ({ pk, action }) => ({
+          url: buildClientRequestUrl(checkout.couponSelectionPage, {
+            useFormData: true
+          }),
+          method: 'POST',
+          body: {
+            coupon: pk,
+            action
+          }
+        }),
+        invalidatesTags: ['Basket']
+      }
+    ),
     completeCreditCardPayment: build.mutation<
       CheckoutResponse,
       CompleteCreditCardParams
@@ -630,6 +651,8 @@ export const {
   useFetchCheckoutResultQuery,
   useGet3dRedirectFormQuery,
   useGetContractQuery,
+  useGetCouponsQuery,
+  useSetCouponMutation,
   useCompleteCreditCardPaymentMutation,
   useCompleteFundsTransferMutation,
   useGuestLoginMutation,

package/data/urls.ts

@@ -103,7 +103,8 @@ export const checkout = {
     '/orders/checkout/?page=ConfirmationPaymentCompletePage',
   completeLoyaltyPayment: '/orders/checkout/?page=LoyaltyPaymentSelectedPage',
   loyaltyMoneyUsage: '/orders/checkout/?page=LoyaltyMoneyUsagePage',
-  setOrderNote: '/orders/checkout/?page=OrderNotePage'
+  setOrderNote: '/orders/checkout/?page=OrderNotePage',
+  couponSelectionPage: '/orders/checkout/?page=CouponSelectionPage'
 };
 
 export const flatpage = {

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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.20.0",
+  "version": "1.21.0-rc.1",
   "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.20.0",
+    "@akinon/eslint-plugin-projectzero": "1.21.0-rc.1",
     "eslint-config-prettier": "8.5.0"
   }
 }

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,