From 7adaa1aa3c9be3c46793c2b700155b4cd42edac3 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 13 Feb 2025 16:59:26 +0000 Subject: [PATCH] revert engine fix --- .changeset/little-ears-work.md | 5 ----- packages/engine-multi/src/worker/thread/run.ts | 13 ++++++++++++- 2 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 .changeset/little-ears-work.md diff --git a/.changeset/little-ears-work.md b/.changeset/little-ears-work.md deleted file mode 100644 index 3da579bcc..000000000 --- a/.changeset/little-ears-work.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@openfn/engine-multi': patch ---- - -Remove unneccessary event processing diff --git a/packages/engine-multi/src/worker/thread/run.ts b/packages/engine-multi/src/worker/thread/run.ts index 80039d8aa..8e708b87c 100644 --- a/packages/engine-multi/src/worker/thread/run.ts +++ b/packages/engine-multi/src/worker/thread/run.ts @@ -7,6 +7,8 @@ import type { SanitizePolicies } from '@openfn/logger'; import { register, publish } from './runtime'; import { execute, createLoggers } from './helpers'; +import serializeError from '../../util/serialize-error'; +import { JobErrorPayload } from '../../events'; export type RunOptions = { repoDir: string; @@ -15,6 +17,13 @@ export type RunOptions = { statePropsToRemove?: string[]; }; +const eventMap = { + 'job-error': (evt: JobErrorPayload) => ({ + ...evt, + error: serializeError(evt.error), + }), +}; + register({ run: (plan: ExecutionPlan, input: State, runOptions: RunOptions) => { const { repoDir, whitelist, sanitize, statePropsToRemove } = runOptions; @@ -52,9 +61,11 @@ register({ // For now I am preloading credentials // resolveCredential: async (id: string) => {}, notify: (name: NotifyEvents, payload: any) => { + // @ts-ignore + const mappedPayload = eventMap[name]?.(payload) ?? payload; publish(`worker:${name}`, { workflowId: plan.id, - ...payload, + ...mappedPayload, }); }, },