feat(medusa): Improve add line item to cart perf and transaction management + clustering start command

.changeset/tasty-ants-visit.md

@@ -0,0 +1,7 @@
+---
+"@medusajs/medusa": patch
+"@medusajs/medusa-cli": patch
+"@medusajs/admin-ui": patch
+---
+
+feat(medusa, medusa-cli): Improve add line item + cluster starting with medusa cli

integration-tests/helpers/draft-order-seeder.js

@@ -145,27 +145,23 @@ module.exports = async (dataSource, data = {}) => {
     name: "Test Region",
     currency_code: "usd",
     tax_rate: 0,
-    payment_providers: [
-      {
-        id: "test-pay",
-        is_installed: true,
-      },
-    ],
   })
 
+  await manager.query(
+    `insert into region_payment_providers values ('test-region', 'test-pay');`
+  )
+
   await manager.insert(Region, {
     id: "test-region-2",
     name: "Test Region 2",
     currency_code: "eur",
     tax_rate: 0,
-    payment_providers: [
-      {
-        id: "test-pay",
-        is_installed: true,
-      },
-    ],
   })
 
+  await manager.query(
+    `insert into region_payment_providers values ('test-region-2', 'test-pay');`
+  )
+
   await manager.insert(DiscountRule, {
     id: "discount_rule_id",
     description: "test description",

integration-tests/plugins/__tests__/inventory/cart/cart.js

@@ -17,7 +17,7 @@ const {
   getContainer,
 } = require("../../../../environment-helpers/use-container")
 
-jest.setTimeout(30000)
+jest.setTimeout(60000)
 
 const adminHeaders = { headers: { "x-medusa-access-token": "test_token" } }
 

packages/admin-ui/src/node/actions/build.ts

@@ -15,7 +15,9 @@ export async function build({
   options,
   reporting = "fancy",
 }: BuildArgs) {
-  await createCacheDir({ appDir, plugins })
+  if (!process.env.PLUGIN_ADMIN_UI_SKIP_CACHE) {
+    await createCacheDir({ appDir, plugins })
+  }
 
   const cacheDir = path.resolve(appDir, ".cache")
   const entry = path.resolve(cacheDir, "admin", "src", "main.tsx")

packages/admin-ui/src/node/utils/create-cache-dir.ts

@@ -5,6 +5,10 @@ import { createEntry } from "./create-entry"
 import { logger } from "./logger"
 
 async function copyAdmin(dest: string) {
+  if (process.env.PLUGIN_ADMIN_UI_SKIP_CACHE) {
+    return true
+  }
+
   const adminDir = path.resolve(__dirname, "..", "ui")
   const destDir = path.resolve(dest, "admin")
 

packages/admin-ui/src/node/utils/create-entry.ts

@@ -13,6 +13,10 @@ import {
 const FILE_EXT_REGEX = /\.[^/.]+$/
 
 async function copyLocalExtensions(src: string, dest: string) {
+  if (process.env.PLUGIN_ADMIN_UI_SKIP_CACHE) {
+    return true
+  }
+
   try {
     await fse.copy(src, dest, {
       filter: copyFilter,

packages/medusa-cli/src/create-cli.ts

@@ -1,13 +1,13 @@
-import path from "path"
-import resolveCwd from "resolve-cwd"
 import { sync as existsSync } from "fs-exists-cached"
 import { setTelemetryEnabled } from "medusa-telemetry"
+import path from "path"
+import resolveCwd from "resolve-cwd"
 
-import { getLocalMedusaVersion } from "./util/version"
 import { didYouMean } from "./did-you-mean"
+import { getLocalMedusaVersion } from "./util/version"
 
-import reporter from "./reporter"
 import { newStarter } from "./commands/new"
+import reporter from "./reporter"
 
 const yargs = require(`yargs`)
 
@@ -233,6 +233,42 @@ function buildLocalCommands(cli, isLocalProject) {
         })
       ),
     })
+    .command({
+      command: `start-cluster`,
+      desc: `Start development server in cluster mode (beta).`,
+      builder: (_) =>
+        _.option(`H`, {
+          alias: `host`,
+          type: `string`,
+          default: defaultHost,
+          describe: `Set host. Defaults to ${defaultHost}`,
+        })
+          .option(`p`, {
+            alias: `port`,
+            type: `string`,
+            default: process.env.PORT || defaultPort,
+            describe: process.env.PORT
+              ? `Set port. Defaults to ${process.env.PORT} (set by env.PORT) (otherwise defaults ${defaultPort})`
+              : `Set port. Defaults to ${defaultPort}`,
+          })
+          .option(`c`, {
+            alias: `cpus`,
+            type: `number`,
+            default: process.env.CPUS,
+            describe:
+              "Set number of cpus to use. Defaults to max number of cpus available on the system (set by env.CPUS)",
+          }),
+      handler: handlerP(
+        getCommandHandler(`start-cluster`, (args, cmd) => {
+          process.env.NODE_ENV = process.env.NODE_ENV || `development`
+          cmd(args)
+          // Return an empty promise to prevent handlerP from exiting early.
+          // The development server shouldn't ever exit until the user directly
+          // kills it so this is fine.
+          return new Promise((resolve) => {})
+        })
+      ),
+    })
     .command({
       command: `user`,
       desc: `Create a user`,

packages/medusa/src/api/routes/store/carts/create-line-item/index.ts

@@ -2,16 +2,18 @@ import { IsInt, IsOptional, IsString } from "class-validator"
 import { EntityManager } from "typeorm"
 import { validator } from "../../../../../utils/validator"
 import {
+  addOrUpdateLineItem,
   CreateLineItemSteps,
-  handleAddOrUpdateLineItem,
+  setPaymentSession,
+  setVariantAvailability,
 } from "./utils/handler-steps"
 import { IdempotencyKey } from "../../../../../models"
-import {
-  initializeIdempotencyRequest,
-  runIdempotencyStep,
-  RunIdempotencyStepOptions,
-} from "../../../../../utils/idempotency"
+import { initializeIdempotencyRequest } from "../../../../../utils/idempotency"
 import { cleanResponseData } from "../../../../../utils/clean-response-data"
+import IdempotencyKeyService from "../../../../../services/idempotency-key"
+import { defaultStoreCartFields, defaultStoreCartRelations } from "../index"
+import { CartService } from "../../../../../services"
+import { promiseAll } from "@medusajs/utils"
 
 /**
  * @oas [post] /store/carts/{id}/line-items
@@ -89,34 +91,82 @@ export default async (req, res) => {
   let inProgress = true
   let err: unknown = false
 
-  const stepOptions: RunIdempotencyStepOptions = {
-    manager,
-    idempotencyKey,
-    container: req.scope,
-    isolationLevel: "SERIALIZABLE",
-  }
+  const idempotencyKeyService: IdempotencyKeyService = req.scope.resolve(
+    "idempotencyKeyService"
+  )
 
   while (inProgress) {
     switch (idempotencyKey.recovery_point) {
       case CreateLineItemSteps.STARTED: {
-        await runIdempotencyStep(async ({ manager }) => {
-          return await handleAddOrUpdateLineItem(
-            id,
-            {
-              customer_id: customerId,
-              metadata: validated.metadata,
-              quantity: validated.quantity,
-              variant_id: validated.variant_id,
-            },
-            {
-              manager,
-              container: req.scope,
-            }
-          )
-        }, stepOptions).catch((e) => {
+        try {
+          const cartId = id
+          const data = {
+            customer_id: customerId,
+            metadata: validated.metadata,
+            quantity: validated.quantity,
+            variant_id: validated.variant_id,
+          }
+
+          await addOrUpdateLineItem({
+            cartId,
+            container: req.scope,
+            manager,
+            data,
+          })
+
+          idempotencyKey = await idempotencyKeyService
+            .withTransaction(manager)
+            .update(idempotencyKey.idempotency_key, {
+              recovery_point: CreateLineItemSteps.SET_PAYMENT_SESSIONS,
+            })
+        } catch (e) {
           inProgress = false
           err = e
-        })
+        }
+
+        break
+      }
+
+      case CreateLineItemSteps.SET_PAYMENT_SESSIONS: {
+        try {
+          const cartService: CartService = req.scope.resolve("cartService")
+
+          const cart = await cartService
+            .withTransaction(manager)
+            .retrieveWithTotals(id, {
+              select: defaultStoreCartFields,
+              relations: [
+                ...defaultStoreCartRelations,
+                "billing_address",
+                "region.payment_providers",
+                "payment_sessions",
+                "customer",
+              ],
+            })
+
+          const args = {
+            cart,
+            container: req.scope,
+            manager,
+          }
+
+          await promiseAll([
+            setVariantAvailability(args),
+            setPaymentSession(args),
+          ])
+
+          idempotencyKey = await idempotencyKeyService
+            .withTransaction(manager)
+            .update(idempotencyKey.idempotency_key, {
+              recovery_point: CreateLineItemSteps.FINISHED,
+              response_code: 200,
+              response_body: { cart },
+            })
+        } catch (e) {
+          inProgress = false
+          err = e
+        }
+
         break
       }