From d1427ffd54c7934d71f2dd5920fcea5c98c51470 Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Thu, 28 Dec 2023 13:24:53 +0100 Subject: [PATCH] feat: Convert workers to use js files --- packages/backend/src/workers/{action.ts => action.js} | 9 ++------- .../workers/{delete-user.ee.ts => delete-user.ee.js} | 4 ++-- packages/backend/src/workers/{email.ts => email.js} | 3 ++- packages/backend/src/workers/{flow.ts => flow.js} | 1 + ...ons.ee.ts => remove-cancelled-subscriptions.ee.js} | 1 + .../backend/src/workers/{trigger.ts => trigger.js} | 11 ++--------- 6 files changed, 10 insertions(+), 19 deletions(-) rename packages/backend/src/workers/{action.ts => action.js} (93%) rename packages/backend/src/workers/{delete-user.ee.ts => delete-user.ee.js} (95%) rename packages/backend/src/workers/{email.ts => email.js} (95%) rename packages/backend/src/workers/{flow.ts => flow.js} (98%) rename packages/backend/src/workers/{remove-cancelled-subscriptions.ee.ts => remove-cancelled-subscriptions.ee.js} (96%) rename packages/backend/src/workers/{trigger.ts => trigger.js} (88%) diff --git a/packages/backend/src/workers/action.ts b/packages/backend/src/workers/action.js similarity index 93% rename from packages/backend/src/workers/action.ts rename to packages/backend/src/workers/action.js index c06833d3..d5bd1cf1 100644 --- a/packages/backend/src/workers/action.ts +++ b/packages/backend/src/workers/action.js @@ -1,4 +1,5 @@ import { Worker } from 'bullmq'; +import process from 'node:process'; import * as Sentry from '../helpers/sentry.ee'; import redisConfig from '../config/redis'; @@ -12,19 +13,13 @@ import { } from '../helpers/remove-job-configuration'; import delayAsMilliseconds from '../helpers/delay-as-milliseconds'; -type JobData = { - flowId: string; - executionId: string; - stepId: string; -}; - const DEFAULT_DELAY_DURATION = 0; export const worker = new Worker( 'action', async (job) => { const { stepId, flowId, executionId, computedParameters, executionStep } = - await processAction(job.data as JobData); + await processAction(job.data); if (executionStep.isFailed) return; diff --git a/packages/backend/src/workers/delete-user.ee.ts b/packages/backend/src/workers/delete-user.ee.js similarity index 95% rename from packages/backend/src/workers/delete-user.ee.ts rename to packages/backend/src/workers/delete-user.ee.js index 36f9834c..c18d3bb4 100644 --- a/packages/backend/src/workers/delete-user.ee.ts +++ b/packages/backend/src/workers/delete-user.ee.js @@ -1,11 +1,11 @@ import { Worker } from 'bullmq'; +import process from 'node:process'; import * as Sentry from '../helpers/sentry.ee'; import redisConfig from '../config/redis'; import logger from '../helpers/logger'; import appConfig from '../config/app'; import User from '../models/user'; -import Execution from '../models/execution'; import ExecutionStep from '../models/execution-step'; export const worker = new Worker( @@ -23,7 +23,7 @@ export const worker = new Worker( .$relatedQuery('executions') .withSoftDeleted() .select('executions.id') - ).map((execution: Execution) => execution.id); + ).map((execution) => execution.id); await ExecutionStep.query() .withSoftDeleted() diff --git a/packages/backend/src/workers/email.ts b/packages/backend/src/workers/email.js similarity index 95% rename from packages/backend/src/workers/email.ts rename to packages/backend/src/workers/email.js index 0a0d0c6e..1db4562d 100644 --- a/packages/backend/src/workers/email.ts +++ b/packages/backend/src/workers/email.js @@ -1,4 +1,5 @@ import { Worker } from 'bullmq'; +import process from 'node:process'; import * as Sentry from '../helpers/sentry.ee'; import redisConfig from '../config/redis'; @@ -11,7 +12,7 @@ const isCloudSandbox = () => { return appConfig.isCloud && !appConfig.isProd; }; -const isAutomatischEmail = (email: string) => { +const isAutomatischEmail = (email) => { return email.endsWith('@automatisch.io'); }; diff --git a/packages/backend/src/workers/flow.ts b/packages/backend/src/workers/flow.js similarity index 98% rename from packages/backend/src/workers/flow.ts rename to packages/backend/src/workers/flow.js index d97e954c..22974465 100644 --- a/packages/backend/src/workers/flow.ts +++ b/packages/backend/src/workers/flow.js @@ -1,4 +1,5 @@ import { Worker } from 'bullmq'; +import process from 'node:process'; import * as Sentry from '../helpers/sentry.ee'; import redisConfig from '../config/redis'; diff --git a/packages/backend/src/workers/remove-cancelled-subscriptions.ee.ts b/packages/backend/src/workers/remove-cancelled-subscriptions.ee.js similarity index 96% rename from packages/backend/src/workers/remove-cancelled-subscriptions.ee.ts rename to packages/backend/src/workers/remove-cancelled-subscriptions.ee.js index ab288e8e..50df129b 100644 --- a/packages/backend/src/workers/remove-cancelled-subscriptions.ee.ts +++ b/packages/backend/src/workers/remove-cancelled-subscriptions.ee.js @@ -1,4 +1,5 @@ import { Worker } from 'bullmq'; +import process from 'node:process'; import { DateTime } from 'luxon'; import * as Sentry from '../helpers/sentry.ee'; import redisConfig from '../config/redis'; diff --git a/packages/backend/src/workers/trigger.ts b/packages/backend/src/workers/trigger.js similarity index 88% rename from packages/backend/src/workers/trigger.ts rename to packages/backend/src/workers/trigger.js index 2062b99f..dbe299ef 100644 --- a/packages/backend/src/workers/trigger.ts +++ b/packages/backend/src/workers/trigger.js @@ -1,6 +1,6 @@ import { Worker } from 'bullmq'; +import process from 'node:process'; -import { IJSONObject, ITriggerItem } from '@automatisch/types'; import * as Sentry from '../helpers/sentry.ee'; import redisConfig from '../config/redis'; import logger from '../helpers/logger'; @@ -12,18 +12,11 @@ import { REMOVE_AFTER_7_DAYS_OR_50_JOBS, } from '../helpers/remove-job-configuration'; -type JobData = { - flowId: string; - stepId: string; - triggerItem?: ITriggerItem; - error?: IJSONObject; -}; - export const worker = new Worker( 'trigger', async (job) => { const { flowId, executionId, stepId, executionStep } = await processTrigger( - job.data as JobData + job.data ); if (executionStep.isFailed) return;