Merge branch 'develop' into feat/payments

medusajs · Aug 20, 2024 · 8b55130 · 8b55130
2 parents d391df9 + 69830ca
commit 8b55130
Show file tree

Hide file tree

Showing 10 changed files with 127 additions and 77 deletions.
diff --git a/packages/core/medusa-test-utils/src/database.ts b/packages/core/medusa-test-utils/src/database.ts
@@ -30,6 +30,9 @@ export function getMikroOrmConfig({
     entities: Object.values(mikroOrmEntities),
     schema: schema ?? process.env.MEDUSA_DB_SCHEMA,
     debug: false,
+    pool: {
+      min: 2,
+    },
     migrations: {
       pathTs: pathToMigrations,
       silent: true,

diff --git a/packages/core/types/src/workflows-sdk/service.ts b/packages/core/types/src/workflows-sdk/service.ts
@@ -11,6 +11,7 @@ type FlowRunOptions<TData = unknown> = {
   context?: Context
   resultFrom?: string | string[] | Symbol
   throwOnError?: boolean
+  logOnError?: boolean
   events?: Record<string, Function>
 }
 

diff --git a/packages/core/utils/src/dal/mikro-orm/mikro-orm-create-connection.ts b/packages/core/utils/src/dal/mikro-orm/mikro-orm-create-connection.ts
@@ -93,6 +93,9 @@ export async function mikroOrmCreateConnection(
     schemaGenerator: {
       disableForeignKeys: false,
     },
-    pool: database.pool as any,
+    pool: {
+      min: 2,
+      ...database.pool,
+    },
   })
 }
diff --git a/packages/core/utils/src/modules-sdk/create-pg-connection.ts b/packages/core/utils/src/modules-sdk/create-pg-connection.ts
@@ -27,7 +27,7 @@ export function createPgConnection(options: Options) {
     pool: {
       // https://knexjs.org/guide/#pool
       ...(pool ?? {}),
-      min: (pool?.min as number) ?? 0,
+      min: (pool?.min as number) ?? 2,
     },
   })
 }
diff --git a/packages/core/workflows-sdk/src/helper/type.ts b/packages/core/workflows-sdk/src/helper/type.ts
@@ -1,47 +1,39 @@
-import { Context, LoadedModule, MedusaContainer } from "@medusajs/types"
 import {
-  DistributedTransactionType,
   DistributedTransactionEvents,
+  DistributedTransactionType,
   LocalWorkflow,
   TransactionStepError,
 } from "@medusajs/orchestration"
+import { Context, LoadedModule, MedusaContainer } from "@medusajs/types"
 
-export type FlowRunOptions<TData = unknown> = {
-  input?: TData
+type BaseFlowRunOptions = {
   context?: Context
   resultFrom?: string | string[] | Symbol
   throwOnError?: boolean
+  logOnError?: boolean
   events?: DistributedTransactionEvents
   container?: LoadedModule[] | MedusaContainer
 }
 
-export type FlowRegisterStepSuccessOptions<TData = unknown> = {
-  idempotencyKey: string
-  response?: TData
-  context?: Context
-  resultFrom?: string | string[] | Symbol
-  throwOnError?: boolean
-  events?: DistributedTransactionEvents
-  container?: LoadedModule[] | MedusaContainer
+export type FlowRunOptions<TData = unknown> = BaseFlowRunOptions & {
+  input?: TData
 }
 
-export type FlowRegisterStepFailureOptions<TData = unknown> = {
-  idempotencyKey: string
-  response?: TData
-  context?: Context
-  resultFrom?: string | string[] | Symbol
-  throwOnError?: boolean
-  events?: DistributedTransactionEvents
-  container?: LoadedModule[] | MedusaContainer
-}
+export type FlowRegisterStepSuccessOptions<TData = unknown> =
+  BaseFlowRunOptions & {
+    idempotencyKey: string
+    response?: TData
+  }
 
-export type FlowCancelOptions = {
+export type FlowRegisterStepFailureOptions<TData = unknown> =
+  BaseFlowRunOptions & {
+    idempotencyKey: string
+    response?: TData
+  }
+
+export type FlowCancelOptions = BaseFlowRunOptions & {
   transaction?: DistributedTransactionType
   transactionId?: string
-  context?: Context
-  throwOnError?: boolean
-  events?: DistributedTransactionEvents
-  container?: LoadedModule[] | MedusaContainer
 }
 
 /**

diff --git a/packages/core/workflows-sdk/src/helper/workflow-export.ts b/packages/core/workflows-sdk/src/helper/workflow-export.ts
@@ -1,7 +1,7 @@
 import { MedusaModule } from "@medusajs/modules-sdk"
 import {
-  DistributedTransactionType,
   DistributedTransactionEvents,
+  DistributedTransactionType,
   LocalWorkflow,
   TransactionHandlerType,
   TransactionState,
@@ -62,6 +62,7 @@ function createContextualWorkflowRunner<
     method,
     {
       throwOnError,
+      logOnError = false,
       resultFrom,
       isCancel = false,
       container: executionContainer,
@@ -86,7 +87,7 @@ function createContextualWorkflowRunner<
 
     const { eventGroupId } = context
 
-    attachOnFinishReleaseEvents(events, eventGroupId!, flow)
+    attachOnFinishReleaseEvents(events, eventGroupId!, flow, { logOnError })
 
     const flowMetadata = {
       eventGroupId,
@@ -143,21 +144,18 @@ function createContextualWorkflowRunner<
     }
   }
 
-  const newRun = async (
-    {
-      input,
-      context: outerContext,
-      throwOnError,
-      resultFrom,
-      events,
-      container,
-    }: FlowRunOptions = {
-      throwOnError: true,
-      resultFrom: defaultResult,
-    }
-  ) => {
+  const newRun = async ({
+    input,
+    context: outerContext,
+    throwOnError,
+    logOnError,
+    resultFrom,
+    events,
+    container,
+  }: FlowRunOptions = {}) => {
     resultFrom ??= defaultResult
     throwOnError ??= true
+    logOnError ??= false
 
     const context = {
       ...outerContext,
@@ -185,7 +183,12 @@ function createContextualWorkflowRunner<
 
     return await originalExecution(
       originalRun,
-      { throwOnError, resultFrom, container },
+      {
+        throwOnError,
+        resultFrom,
+        container,
+        logOnError,
+      },
       context.transactionId,
       input,
       context,
@@ -200,17 +203,18 @@ function createContextualWorkflowRunner<
       idempotencyKey,
       context: outerContext,
       throwOnError,
+      logOnError,
       resultFrom,
       events,
       container,
     }: FlowRegisterStepSuccessOptions = {
       idempotencyKey: "",
-      throwOnError: true,
-      resultFrom: defaultResult,
     }
   ) => {
+    idempotencyKey ??= ""
     resultFrom ??= defaultResult
     throwOnError ??= true
+    logOnError ??= false
 
     const [, transactionId] = idempotencyKey.split(":")
     const context = {
@@ -223,7 +227,12 @@ function createContextualWorkflowRunner<
 
     return await originalExecution(
       originalRegisterStepSuccess,
-      { throwOnError, resultFrom, container },
+      {
+        throwOnError,
+        resultFrom,
+        container,
+        logOnError,
+      },
       idempotencyKey,
       response,
       context,
@@ -238,17 +247,18 @@ function createContextualWorkflowRunner<
       idempotencyKey,
       context: outerContext,
       throwOnError,
+      logOnError,
       resultFrom,
       events,
       container,
     }: FlowRegisterStepFailureOptions = {
       idempotencyKey: "",
-      throwOnError: true,
-      resultFrom: defaultResult,
     }
   ) => {
+    idempotencyKey ??= ""
     resultFrom ??= defaultResult
     throwOnError ??= true
+    logOnError ??= false
 
     const [, transactionId] = idempotencyKey.split(":")
     const context = {
@@ -261,7 +271,12 @@ function createContextualWorkflowRunner<
 
     return await originalExecution(
       originalRegisterStepFailure,
-      { throwOnError, resultFrom, container },
+      {
+        throwOnError,
+        resultFrom,
+        container,
+        logOnError,
+      },
       idempotencyKey,
       response,
       context,
@@ -270,19 +285,17 @@ function createContextualWorkflowRunner<
   }
   flow.registerStepFailure = newRegisterStepFailure as any
 
-  const newCancel = async (
-    {
-      transaction,
-      transactionId,
-      context: outerContext,
-      throwOnError,
-      events,
-      container,
-    }: FlowCancelOptions = {
-      throwOnError: true,
-    }
-  ) => {
+  const newCancel = async ({
+    transaction,
+    transactionId,
+    context: outerContext,
+    throwOnError,
+    logOnError,
+    events,
+    container,
+  }: FlowCancelOptions = {}) => {
     throwOnError ??= true
+    logOnError ??= false
 
     const context = {
       ...outerContext,
@@ -299,6 +312,7 @@ function createContextualWorkflowRunner<
         resultFrom: undefined,
         isCancel: true,
         container,
+        logOnError,
       },
       transaction ?? transactionId!,
       undefined,
@@ -478,7 +492,12 @@ export const exportWorkflow = <TData = unknown, TResult = unknown>(
 function attachOnFinishReleaseEvents(
   events: DistributedTransactionEvents = {},
   eventGroupId: string,
-  flow: LocalWorkflow
+  flow: LocalWorkflow,
+  {
+    logOnError,
+  }: {
+    logOnError?: boolean
+  } = {}
 ) {
   const onFinish = events.onFinish
 
@@ -487,6 +506,30 @@ function attachOnFinishReleaseEvents(
     result?: unknown
     errors?: unknown[]
   }) => {
+    const { transaction } = args
+
+    const logger =
+      (flow.container as MedusaContainer).resolve(
+        ContainerRegistrationKeys.LOGGER,
+        { allowUnregistered: true }
+      ) || console
+
+    if (logOnError) {
+      const TERMINAL_SIZE = process.stdout?.columns ?? 60
+      const separator = new Array(TERMINAL_SIZE).join("-")
+
+      const worflowName = transaction.getFlow().modelId
+      const allWorkflowErrors = transaction
+        .getErrors()
+        .map(
+          (err) =>
+            `${worflowName}:${err?.action}:${err?.handlerType} - ${err?.error?.message}${EOL}${err?.error?.stack}`
+        )
+        .join(EOL + separator + EOL)
+
+      logger.error(allWorkflowErrors)
+    }
+
     await onFinish?.(args)
 
     const eventBusService = (flow.container as MedusaContainer).resolve(
@@ -498,13 +541,6 @@ function attachOnFinishReleaseEvents(
       return
     }
 
-    const logger =
-      (flow.container as MedusaContainer).resolve(
-        ContainerRegistrationKeys.LOGGER,
-        { allowUnregistered: true }
-      ) || console
-
-    const { transaction } = args
     const failedStatus = [TransactionState.FAILED, TransactionState.REVERTED]
 
     if (failedStatus.includes(transaction.getState())) {

diff --git a/packages/framework/framework/src/database/pg-connection-loader.ts b/packages/framework/framework/src/database/pg-connection-loader.ts
@@ -23,6 +23,7 @@ export function pgConnectionLoader(): ReturnType<
     configModule.projectConfig.databaseDriverOptions || {}
   const schema = configModule.projectConfig.databaseSchema || "public"
   const idleTimeoutMillis = driverOptions.pool?.idleTimeoutMillis ?? undefined // prevent null to be passed
+  const poolMin = driverOptions.pool?.min ?? 2
   const poolMax = driverOptions.pool?.max
 
   delete driverOptions.pool
@@ -32,6 +33,7 @@ export function pgConnectionLoader(): ReturnType<
     schema,
     driverOptions,
     pool: {
+      min: poolMin,
       max: poolMax,
       idleTimeoutMillis,
     },