asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(workflow-engine-*): subscribe response and error (#6869)

Browse Source
This commit is contained in:
Carlos R. L. Rodrigues
2024-03-29 08:23:41 +00:00
committed by GitHub
parent d97af91a8d
commit e603726985
6 changed files with 67 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changeset/brown-spoons-sparkle.md
+8
View File
@@ -0,0 +1,8 @@
---
"@medusajs/workflow-engine-inmemory": patch
"@medusajs/workflow-engine-redis": patch
"@medusajs/workflows-sdk": patch
"@medusajs/orchestration": patch
---
Fix Workflow Engine subscribers response and error
packages/orchestration/src/transaction/transaction-orchestrator.ts
+14 -5
View File
@@ -631,21 +631,30 @@ export class TransactionOrchestrator extends EventEmitter {
transaction,
})
const isAsync = step.isCompensating()
? step.definition.compensateAsync
: step.definition.async
const setStepFailure = async (
error: Error | any,
{ endRetry }: { endRetry?: boolean } = {}
) => {
return TransactionOrchestrator.setStepFailure(
const ret = TransactionOrchestrator.setStepFailure(
transaction,
step,
error,
endRetry ? 0 : step.definition.maxRetries
)
}
const isAsync = step.isCompensating()
? step.definition.compensateAsync
: step.definition.async
if (isAsync) {
await transaction.scheduleRetry(
step,
step.definition.retryInterval ?? 0
)
}
return ret
}
if (!isAsync) {
hasSyncSteps = true
packages/workflow-engine-inmemory/src/services/workflow-orchestrator.ts
+21 -11
View File
@@ -5,11 +5,12 @@ import {
TransactionStep,
} from "@medusajs/orchestration"
import { ContainerLike, Context, MedusaContainer } from "@medusajs/types"
import { InjectSharedContext, isString, MedusaContext } from "@medusajs/utils"
import { InjectSharedContext, MedusaContext, isString } from "@medusajs/utils"
import {
type FlowRunOptions,
MedusaWorkflow,
ReturnWorkflow,
resolveValue,
type FlowRunOptions,
} from "@medusajs/workflows-sdk"
import { ulid } from "ulid"
import { InMemoryDistributedTransactionStorage } from "../utils"
@@ -462,31 +463,40 @@ export class WorkflowOrchestratorService {
notify({ eventType: "onStepBegin", step })
},
onStepSuccess: ({ step, transaction }) => {
const response = transaction.getContext().invoke[step.id]
onStepSuccess: async ({ step, transaction }) => {
const stepName = step.definition.action!
const response = await resolveValue(
transaction.getContext().invoke[stepName],
transaction
)
customEventHandlers?.onStepSuccess?.({ step, transaction, response })
notify({ eventType: "onStepSuccess", step, response })
},
onStepFailure: ({ step, transaction }) => {
const errors = transaction.getErrors(TransactionHandlerType.INVOKE)[
step.id
]
const stepName = step.definition.action!
const errors = transaction
.getErrors(TransactionHandlerType.INVOKE)
.filter((err) => err.action === stepName)
customEventHandlers?.onStepFailure?.({ step, transaction, errors })
notify({ eventType: "onStepFailure", step, errors })
},
onCompensateStepSuccess: ({ step, transaction }) => {
const response = transaction.getContext().compensate[step.id]
const stepName = step.definition.action!
const response = transaction.getContext().compensate[stepName]
customEventHandlers?.onStepSuccess?.({ step, transaction, response })
notify({ eventType: "onCompensateStepSuccess", step, response })
},
onCompensateStepFailure: ({ step, transaction }) => {
const errors = transaction.getErrors(TransactionHandlerType.COMPENSATE)[
step.id
]
const stepName = step.definition.action!
const errors = transaction
.getErrors(TransactionHandlerType.COMPENSATE)
.filter((err) => err.action === stepName)
customEventHandlers?.onStepFailure?.({ step, transaction, errors })
notify({ eventType: "onCompensateStepFailure", step, errors })
packages/workflow-engine-redis/src/services/workflow-orchestrator.ts
+18 -8
View File
@@ -10,6 +10,7 @@ import {
FlowRunOptions,
MedusaWorkflow,
ReturnWorkflow,
resolveValue,
} from "@medusajs/workflows-sdk"
import Redis from "ioredis"
import { ulid } from "ulid"
@@ -512,30 +513,39 @@ export class WorkflowOrchestratorService {
await notify({ eventType: "onStepBegin", step })
},
onStepSuccess: async ({ step, transaction }) => {
const response = transaction.getContext().invoke[step.id]
const stepName = step.definition.action!
const response = await resolveValue(
transaction.getContext().invoke[stepName],
transaction
)
customEventHandlers?.onStepSuccess?.({ step, transaction, response })
await notify({ eventType: "onStepSuccess", step, response })
},
onStepFailure: async ({ step, transaction }) => {
const errors = transaction.getErrors(TransactionHandlerType.INVOKE)[
step.id
]
const stepName = step.definition.action!
const errors = transaction
.getErrors(TransactionHandlerType.INVOKE)
.filter((err) => err.action === stepName)
customEventHandlers?.onStepFailure?.({ step, transaction, errors })
await notify({ eventType: "onStepFailure", step, errors })
},
onCompensateStepSuccess: async ({ step, transaction }) => {
const response = transaction.getContext().compensate[step.id]
const stepName = step.definition.action!
const response = transaction.getContext().compensate[stepName]
customEventHandlers?.onStepSuccess?.({ step, transaction, response })
await notify({ eventType: "onCompensateStepSuccess", step, response })
},
onCompensateStepFailure: async ({ step, transaction }) => {
const errors = transaction.getErrors(TransactionHandlerType.COMPENSATE)[
step.id
]
const stepName = step.definition.action!
const errors = transaction
.getErrors(TransactionHandlerType.COMPENSATE)
.filter((err) => err.action === stepName)
customEventHandlers?.onStepFailure?.({ step, transaction, errors })
await notify({ eventType: "onCompensateStepFailure", step, errors })
packages/workflow-engine-redis/src/utils/workflow-orchestrator-storage.ts
+1 -17
View File
@@ -99,22 +99,6 @@ export class RedisDistributedTransactionStorage extends DistributedTransactionSt
})
}
/*private stringifyWithSymbol(key, value) {
if (key === "__type" && typeof value === "symbol") {
return Symbol.keyFor(value)
}
return value
}
private jsonWithSymbol(key, value) {
if (key === "__type" && typeof value === "string") {
return Symbol.for(value)
}
return value
}*/
async get(key: string): Promise<TransactionCheckpoint | undefined> {
const data = await this.redisClient.get(key)
@@ -276,7 +260,7 @@ export class RedisDistributedTransactionStorage extends DistributedTransactionSt
const key = [type, transaction.modelId, transaction.transactionId]
if (step) {
key.push(step.id)
key.push(step.id, step.attempts + "")
}
return key.join(":")
packages/workflows-sdk/src/utils/composer/helpers/resolve-value.ts
+5 -2
View File
@@ -32,8 +32,6 @@ async function resolveProperty(property, transactionContext) {
* @internal
*/
export async function resolveValue(input, transactionContext) {
const copiedInput = deepCopy(input)
const unwrapInput = async (
inputTOUnwrap: Record<string, unknown>,
parentRef: any
@@ -66,6 +64,11 @@ export async function resolveValue(input, transactionContext) {
return parentRef
}
const copiedInput =
input?.__type === OrchestrationUtils.SymbolWorkflowWorkflowData
? deepCopy(input.output)
: deepCopy(input)
const result = copiedInput?.__type
? await resolveProperty(copiedInput, transactionContext)
: await unwrapInput(copiedInput, {})