From b95478b635585ccba05600f9f3b34750f182f125 Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Thu, 4 Jan 2024 22:24:42 +0100 Subject: [PATCH] chore: Use imports as ES modules --- packages/backend/{knexfile.ts => knexfile.js} | 5 +++- packages/backend/package.json | 5 ++-- .../backend/src/apps/azure-openai/index.ts | 3 ++- packages/backend/src/config/database.js | 4 +-- packages/backend/src/config/orm.js | 2 +- packages/backend/src/config/redis.js | 2 +- .../backend/src/errors/already-processed.js | 4 +-- packages/backend/src/errors/early-exit.js | 2 +- packages/backend/src/errors/http.js | 2 +- .../src/helpers/add-reconnection-steps.js | 2 +- .../backend/src/helpers/app-info-converter.js | 2 +- .../backend/src/helpers/billing/plans.ee.js | 2 +- .../src/helpers/check-worker-readiness.js | 4 +-- .../src/helpers/delay-as-milliseconds.js | 4 +-- packages/backend/src/helpers/get-app.js | 10 ++++--- .../backend/src/helpers/global-variable.js | 6 ++--- .../backend/src/helpers/http-client/index.js | 6 ++--- packages/backend/src/helpers/license.ee.js | 4 +-- packages/backend/src/helpers/logger.js | 2 +- packages/backend/src/helpers/mailer.ee.js | 2 +- packages/backend/src/helpers/sentry.ee.js | 2 +- .../backend/src/helpers/telemetry/index.js | 6 ++--- .../src/helpers/telemetry/organization-id.js | 2 +- .../backend/src/models/app-auth-client.js | 9 ++++--- packages/backend/src/models/app-config.js | 6 ++--- packages/backend/src/models/app.js | 9 ++++--- packages/backend/src/models/base.js | 2 +- packages/backend/src/models/connection.js | 21 ++++++++------- packages/backend/src/models/execution-step.js | 10 +++---- packages/backend/src/models/execution.js | 8 +++--- packages/backend/src/models/flow.js | 10 +++---- packages/backend/src/models/identity.ee.js | 6 ++--- packages/backend/src/models/permission.js | 2 +- packages/backend/src/models/role.js | 6 ++--- .../src/models/saml-auth-provider.ee.js | 8 +++--- .../saml-auth-providers-role-mapping.ee.js | 4 +-- packages/backend/src/models/step.js | 14 +++++----- .../backend/src/models/subscription.ee.js | 8 +++--- packages/backend/src/models/usage-data.ee.js | 6 ++--- packages/backend/src/models/user.js | 26 +++++++++---------- packages/backend/src/queues/action.js | 4 +-- packages/backend/src/queues/flow.js | 4 +-- packages/backend/src/queues/trigger.js | 4 +-- packages/backend/src/services/action.js | 20 +++++++------- packages/backend/src/services/flow.js | 12 ++++----- packages/backend/src/services/trigger.js | 8 +++--- packages/backend/src/worker.js | 24 ++++++++--------- packages/backend/src/workers/action.js | 16 ++++++------ .../backend/src/workers/delete-user.ee.js | 12 ++++----- packages/backend/src/workers/email.js | 12 ++++----- packages/backend/src/workers/flow.js | 16 ++++++------ packages/backend/src/workers/trigger.js | 14 +++++----- 52 files changed, 198 insertions(+), 186 deletions(-) rename packages/backend/{knexfile.ts => knexfile.js} (81%) diff --git a/packages/backend/knexfile.ts b/packages/backend/knexfile.js similarity index 81% rename from packages/backend/knexfile.ts rename to packages/backend/knexfile.js index f8532c82..0748c74b 100644 --- a/packages/backend/knexfile.ts +++ b/packages/backend/knexfile.js @@ -1,7 +1,10 @@ import { knexSnakeCaseMappers } from 'objection'; -import appConfig from './src/config/app'; +import appConfig from './src/config/app.js'; +import path from 'path'; +import { fileURLToPath } from 'url'; const fileExtension = 'js'; +const __dirname = path.dirname(fileURLToPath(import.meta.url)); const knexConfig = { client: 'pg', diff --git a/packages/backend/package.json b/packages/backend/package.json index f645d548..1c77872c 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -3,11 +3,12 @@ "version": "0.10.0", "license": "See LICENSE file", "description": "The open source Zapier alternative. Build workflow automation without spending time and money.", + "type": "module", "scripts": { "dev": "ts-node-dev --watch 'src/graphql/schema.graphql' --exit-child src/server.ts", - "worker": "nodemon --watch 'src/**/*.ts' --exec 'ts-node' src/worker.ts", + "worker": "nodemon --watch 'src/**/*.js' --exec 'node' src/worker.js", "build": "tsc && yarn copy-statics", - "build:watch": "nodemon --watch 'src/**/*.ts' --watch 'bin/**/*.ts' --exec yarn build --ext ts", + "build:watch": "nodemon --watch 'src/**/*.js' --watch 'bin/**/*.ts' --exec yarn build --ext ts", "start": "node dist/src/server.js", "pretest": "APP_ENV=test ts-node ./test/setup/prepare-test-env.ts", "test": "APP_ENV=test jest --verbose", diff --git a/packages/backend/src/apps/azure-openai/index.ts b/packages/backend/src/apps/azure-openai/index.ts index 77f570c3..3c70dfe2 100644 --- a/packages/backend/src/apps/azure-openai/index.ts +++ b/packages/backend/src/apps/azure-openai/index.ts @@ -7,7 +7,8 @@ import actions from './actions'; export default defineApp({ name: 'Azure OpenAI', key: 'azure-openai', - baseUrl: 'https://azure.microsoft.com/en-us/products/ai-services/openai-service', + baseUrl: + 'https://azure.microsoft.com/en-us/products/ai-services/openai-service', apiBaseUrl: '', iconUrl: '{BASE_URL}/apps/azure-openai/assets/favicon.svg', authDocUrl: 'https://automatisch.io/docs/apps/azure-openai/connection', diff --git a/packages/backend/src/config/database.js b/packages/backend/src/config/database.js index f6b15e61..55713b9f 100644 --- a/packages/backend/src/config/database.js +++ b/packages/backend/src/config/database.js @@ -4,8 +4,8 @@ import process from 'process'; import pg from 'pg'; pg.types.setTypeParser(20, 'text', parseInt); import knex from 'knex'; -import knexConfig from '../../knexfile'; -import logger from '../helpers/logger'; +import knexConfig from '../../knexfile.js'; +import logger from '../helpers/logger.js'; export const client = knex(knexConfig); diff --git a/packages/backend/src/config/orm.js b/packages/backend/src/config/orm.js index 77126e91..a2576e71 100644 --- a/packages/backend/src/config/orm.js +++ b/packages/backend/src/config/orm.js @@ -1,4 +1,4 @@ import { Model } from 'objection'; -import { client } from './database'; +import { client } from './database.js'; Model.knex(client); diff --git a/packages/backend/src/config/redis.js b/packages/backend/src/config/redis.js index 4371b911..45d007ea 100644 --- a/packages/backend/src/config/redis.js +++ b/packages/backend/src/config/redis.js @@ -1,4 +1,4 @@ -import appConfig from './app'; +import appConfig from './app.js'; const redisConfig = { host: appConfig.redisHost, diff --git a/packages/backend/src/errors/already-processed.js b/packages/backend/src/errors/already-processed.js index 2f3ef6a8..d38b0ea3 100644 --- a/packages/backend/src/errors/already-processed.js +++ b/packages/backend/src/errors/already-processed.js @@ -1,3 +1,3 @@ -import BaseError from './base'; +import BaseError from './base.js'; -export default class AlreadyProcessedError extends BaseError { } +export default class AlreadyProcessedError extends BaseError {} diff --git a/packages/backend/src/errors/early-exit.js b/packages/backend/src/errors/early-exit.js index c0d92d2c..5e8a2451 100644 --- a/packages/backend/src/errors/early-exit.js +++ b/packages/backend/src/errors/early-exit.js @@ -1,3 +1,3 @@ -import BaseError from './base'; +import BaseError from './base.js'; export default class EarlyExitError extends BaseError {} diff --git a/packages/backend/src/errors/http.js b/packages/backend/src/errors/http.js index 0a3ac8f1..1d0af01e 100644 --- a/packages/backend/src/errors/http.js +++ b/packages/backend/src/errors/http.js @@ -1,4 +1,4 @@ -import BaseError from './base'; +import BaseError from './base.js'; export default class HttpError extends BaseError { constructor(error) { diff --git a/packages/backend/src/helpers/add-reconnection-steps.js b/packages/backend/src/helpers/add-reconnection-steps.js index 95e89d19..58b2a530 100644 --- a/packages/backend/src/helpers/add-reconnection-steps.js +++ b/packages/backend/src/helpers/add-reconnection-steps.js @@ -1,4 +1,4 @@ -import cloneDeep from 'lodash/cloneDeep'; +import cloneDeep from 'lodash/cloneDeep.js'; const connectionIdArgument = { name: 'id', diff --git a/packages/backend/src/helpers/app-info-converter.js b/packages/backend/src/helpers/app-info-converter.js index f2e1202b..6142e2c5 100644 --- a/packages/backend/src/helpers/app-info-converter.js +++ b/packages/backend/src/helpers/app-info-converter.js @@ -1,4 +1,4 @@ -import appConfig from '../config/app'; +import appConfig from '../config/app.js'; const appInfoConverter = (rawAppData) => { rawAppData.iconUrl = rawAppData.iconUrl.replace( diff --git a/packages/backend/src/helpers/billing/plans.ee.js b/packages/backend/src/helpers/billing/plans.ee.js index 2456b71d..41046984 100644 --- a/packages/backend/src/helpers/billing/plans.ee.js +++ b/packages/backend/src/helpers/billing/plans.ee.js @@ -1,4 +1,4 @@ -import appConfig from '../../config/app'; +import appConfig from '../../config/app.js'; const testPlans = [ { diff --git a/packages/backend/src/helpers/check-worker-readiness.js b/packages/backend/src/helpers/check-worker-readiness.js index 81011927..e1ae0a79 100644 --- a/packages/backend/src/helpers/check-worker-readiness.js +++ b/packages/backend/src/helpers/check-worker-readiness.js @@ -1,6 +1,6 @@ import Redis from 'ioredis'; -import logger from './logger'; -import redisConfig from '../config/redis'; +import logger from './logger.js'; +import redisConfig from '../config/redis.js'; const redisClient = new Redis(redisConfig); diff --git a/packages/backend/src/helpers/delay-as-milliseconds.js b/packages/backend/src/helpers/delay-as-milliseconds.js index c9e7dff7..c657647f 100644 --- a/packages/backend/src/helpers/delay-as-milliseconds.js +++ b/packages/backend/src/helpers/delay-as-milliseconds.js @@ -1,5 +1,5 @@ -import delayForAsMilliseconds from './delay-for-as-milliseconds'; -import delayUntilAsMilliseconds from './delay-until-as-milliseconds'; +import delayForAsMilliseconds from './delay-for-as-milliseconds.js'; +import delayUntilAsMilliseconds from './delay-until-as-milliseconds.js'; const delayAsMilliseconds = (eventKey, computedParameters) => { let delayDuration = 0; diff --git a/packages/backend/src/helpers/get-app.js b/packages/backend/src/helpers/get-app.js index e4f1bcab..fee2d4cf 100644 --- a/packages/backend/src/helpers/get-app.js +++ b/packages/backend/src/helpers/get-app.js @@ -1,8 +1,12 @@ import path from 'node:path'; import fs from 'node:fs'; -import { omit, cloneDeep } from 'lodash'; -import addAuthenticationSteps from './add-authentication-steps'; -import addReconnectionSteps from './add-reconnection-steps'; +import omit from 'lodash/omit.js'; +import cloneDeep from 'lodash/cloneDeep.js'; +import addAuthenticationSteps from './add-authentication-steps.js'; +import addReconnectionSteps from './add-reconnection-steps.js'; +import { fileURLToPath } from 'url'; + +const __dirname = path.dirname(fileURLToPath(import.meta.url)); const apps = fs .readdirSync(path.resolve(__dirname, `../apps/`), { withFileTypes: true }) diff --git a/packages/backend/src/helpers/global-variable.js b/packages/backend/src/helpers/global-variable.js index 5b49467f..168be47c 100644 --- a/packages/backend/src/helpers/global-variable.js +++ b/packages/backend/src/helpers/global-variable.js @@ -1,6 +1,6 @@ -import createHttpClient from './http-client'; -import EarlyExitError from '../errors/early-exit'; -import AlreadyProcessedError from '../errors/already-processed'; +import createHttpClient from './http-client/index.js'; +import EarlyExitError from '../errors/early-exit.js'; +import AlreadyProcessedError from '../errors/already-processed.js'; const globalVariable = async (options) => { const { diff --git a/packages/backend/src/helpers/http-client/index.js b/packages/backend/src/helpers/http-client/index.js index bf88f755..e32482df 100644 --- a/packages/backend/src/helpers/http-client/index.js +++ b/packages/backend/src/helpers/http-client/index.js @@ -1,8 +1,6 @@ import { URL } from 'node:url'; -export { AxiosInstance as IHttpClient } from 'axios'; - -import HttpError from '../../errors/http'; -import axios from '../axios-with-proxy'; +import HttpError from '../../errors/http.js'; +import axios from '../axios-with-proxy.js'; const removeBaseUrlForAbsoluteUrls = (requestConfig) => { try { diff --git a/packages/backend/src/helpers/license.ee.js b/packages/backend/src/helpers/license.ee.js index 76716985..d3ae30c0 100644 --- a/packages/backend/src/helpers/license.ee.js +++ b/packages/backend/src/helpers/license.ee.js @@ -1,6 +1,6 @@ import memoryCache from 'memory-cache'; -import appConfig from '../config/app'; -import axios from './axios-with-proxy'; +import appConfig from '../config/app.js'; +import axios from './axios-with-proxy.js'; const CACHE_DURATION = 1000 * 60 * 60 * 24; // 24 hours in milliseconds diff --git a/packages/backend/src/helpers/logger.js b/packages/backend/src/helpers/logger.js index e5c9ee82..c929e5ac 100644 --- a/packages/backend/src/helpers/logger.js +++ b/packages/backend/src/helpers/logger.js @@ -1,5 +1,5 @@ import * as winston from 'winston'; -import appConfig from '../config/app'; +import appConfig from '../config/app.js'; const levels = { error: 0, diff --git a/packages/backend/src/helpers/mailer.ee.js b/packages/backend/src/helpers/mailer.ee.js index ff6fff51..2a574889 100644 --- a/packages/backend/src/helpers/mailer.ee.js +++ b/packages/backend/src/helpers/mailer.ee.js @@ -1,5 +1,5 @@ import nodemailer from 'nodemailer'; -import appConfig from '../config/app'; +import appConfig from '../config/app.js'; const mailer = nodemailer.createTransport({ host: appConfig.smtpHost, diff --git a/packages/backend/src/helpers/sentry.ee.js b/packages/backend/src/helpers/sentry.ee.js index e427963b..f48d50bf 100644 --- a/packages/backend/src/helpers/sentry.ee.js +++ b/packages/backend/src/helpers/sentry.ee.js @@ -1,7 +1,7 @@ import * as Sentry from '@sentry/node'; import * as Tracing from '@sentry/tracing'; -import appConfig from '../config/app'; +import appConfig from '../config/app.js'; const isSentryEnabled = !!appConfig.sentryDsn; diff --git a/packages/backend/src/helpers/telemetry/index.js b/packages/backend/src/helpers/telemetry/index.js index 7d6701d1..7791aec6 100644 --- a/packages/backend/src/helpers/telemetry/index.js +++ b/packages/backend/src/helpers/telemetry/index.js @@ -1,7 +1,7 @@ import Analytics from '@rudderstack/rudder-sdk-node'; -import organizationId from './organization-id'; -import instanceId from './instance-id'; -import appConfig from '../../config/app'; +import organizationId from './organization-id.js'; +import instanceId from './instance-id.js'; +import appConfig from '../../config/app.js'; import os from 'os'; const WRITE_KEY = '284Py4VgK2MsNYV7xlKzyrALx0v'; diff --git a/packages/backend/src/helpers/telemetry/organization-id.js b/packages/backend/src/helpers/telemetry/organization-id.js index 34407375..14c7f41a 100644 --- a/packages/backend/src/helpers/telemetry/organization-id.js +++ b/packages/backend/src/helpers/telemetry/organization-id.js @@ -1,5 +1,5 @@ import CryptoJS from 'crypto-js'; -import appConfig from '../../config/app'; +import appConfig from '../../config/app.js'; const organizationId = () => { const key = appConfig.encryptionKey; diff --git a/packages/backend/src/models/app-auth-client.js b/packages/backend/src/models/app-auth-client.js index 3f069874..965c9cdd 100644 --- a/packages/backend/src/models/app-auth-client.js +++ b/packages/backend/src/models/app-auth-client.js @@ -1,7 +1,8 @@ -import { AES, enc } from 'crypto-js'; -import appConfig from '../config/app'; -import AppConfig from './app-config'; -import Base from './base'; +import AES from 'crypto-js/aes.js'; +import enc from 'crypto-js/enc-utf8.js'; +import appConfig from '../config/app.js'; +import AppConfig from './app-config.js'; +import Base from './base.js'; class AppAuthClient extends Base { static tableName = 'app_auth_clients'; diff --git a/packages/backend/src/models/app-config.js b/packages/backend/src/models/app-config.js index 1e3bda31..eabc3b4b 100644 --- a/packages/backend/src/models/app-config.js +++ b/packages/backend/src/models/app-config.js @@ -1,6 +1,6 @@ -import App from './app'; -import Base from './base'; -import AppAuthClient from './app-auth-client'; +import App from './app.js'; +import Base from './base.js'; +import AppAuthClient from './app-auth-client.js'; class AppConfig extends Base { static tableName = 'app_configs'; diff --git a/packages/backend/src/models/app.js b/packages/backend/src/models/app.js index 6338c107..6131f014 100644 --- a/packages/backend/src/models/app.js +++ b/packages/backend/src/models/app.js @@ -1,7 +1,10 @@ import fs from 'fs'; -import { join } from 'path'; -import appInfoConverter from '../helpers/app-info-converter'; -import getApp from '../helpers/get-app'; +import path, { join } from 'path'; +import { fileURLToPath } from 'url'; +import appInfoConverter from '../helpers/app-info-converter.js'; +import getApp from '../helpers/get-app.js'; + +const __dirname = path.dirname(fileURLToPath(import.meta.url)); class App { static folderPath = join(__dirname, '../apps'); diff --git a/packages/backend/src/models/base.js b/packages/backend/src/models/base.js index 2b1a6e5c..7cd22d72 100644 --- a/packages/backend/src/models/base.js +++ b/packages/backend/src/models/base.js @@ -1,7 +1,7 @@ import { AjvValidator, Model, snakeCaseMappers } from 'objection'; import addFormats from 'ajv-formats'; -import ExtendedQueryBuilder from './query-builder'; +import ExtendedQueryBuilder from './query-builder.js'; class Base extends Model { static QueryBuilder = ExtendedQueryBuilder; diff --git a/packages/backend/src/models/connection.js b/packages/backend/src/models/connection.js index 2ba8b67b..fb2bfeff 100644 --- a/packages/backend/src/models/connection.js +++ b/packages/backend/src/models/connection.js @@ -1,13 +1,14 @@ -import { AES, enc } from 'crypto-js'; -import App from './app'; -import AppConfig from './app-config'; -import AppAuthClient from './app-auth-client'; -import Base from './base'; -import User from './user'; -import Step from './step'; -import appConfig from '../config/app'; -import Telemetry from '../helpers/telemetry'; -import globalVariable from '../helpers/global-variable'; +import AES from 'crypto-js/aes.js'; +import enc from 'crypto-js/enc-utf8.js'; +import App from './app.js'; +import AppConfig from './app-config.js'; +import AppAuthClient from './app-auth-client.js'; +import Base from './base.js'; +import User from './user.js'; +import Step from './step.js'; +import appConfig from '../config/app.js'; +import Telemetry from '../helpers/telemetry/index.js'; +import globalVariable from '../helpers/global-variable.js'; class Connection extends Base { static tableName = 'connections'; diff --git a/packages/backend/src/models/execution-step.js b/packages/backend/src/models/execution-step.js index 1cd470f9..267bbfb9 100644 --- a/packages/backend/src/models/execution-step.js +++ b/packages/backend/src/models/execution-step.js @@ -1,8 +1,8 @@ -import appConfig from '../config/app'; -import Base from './base'; -import Execution from './execution'; -import Step from './step'; -import Telemetry from '../helpers/telemetry'; +import appConfig from '../config/app.js'; +import Base from './base.js'; +import Execution from './execution.js'; +import Step from './step.js'; +import Telemetry from '../helpers/telemetry/index.js'; class ExecutionStep extends Base { static tableName = 'execution_steps'; diff --git a/packages/backend/src/models/execution.js b/packages/backend/src/models/execution.js index 8f3b1629..9b219700 100644 --- a/packages/backend/src/models/execution.js +++ b/packages/backend/src/models/execution.js @@ -1,7 +1,7 @@ -import Base from './base'; -import Flow from './flow'; -import ExecutionStep from './execution-step'; -import Telemetry from '../helpers/telemetry'; +import Base from './base.js'; +import Flow from './flow.js'; +import ExecutionStep from './execution-step.js'; +import Telemetry from '../helpers/telemetry/index.js'; class Execution extends Base { static tableName = 'executions'; diff --git a/packages/backend/src/models/flow.js b/packages/backend/src/models/flow.js index 3080340a..5c357156 100644 --- a/packages/backend/src/models/flow.js +++ b/packages/backend/src/models/flow.js @@ -1,9 +1,9 @@ import { ValidationError } from 'objection'; -import Base from './base'; -import Step from './step'; -import User from './user'; -import Execution from './execution'; -import Telemetry from '../helpers/telemetry'; +import Base from './base.js'; +import Step from './step.js'; +import User from './user.js'; +import Execution from './execution.js'; +import Telemetry from '../helpers/telemetry/index.js'; class Flow extends Base { static tableName = 'flows'; diff --git a/packages/backend/src/models/identity.ee.js b/packages/backend/src/models/identity.ee.js index 8a66e1bb..09b37424 100644 --- a/packages/backend/src/models/identity.ee.js +++ b/packages/backend/src/models/identity.ee.js @@ -1,6 +1,6 @@ -import Base from './base'; -import SamlAuthProvider from './saml-auth-provider.ee'; -import User from './user'; +import Base from './base.js'; +import SamlAuthProvider from './saml-auth-provider.ee.js'; +import User from './user.js'; class Identity extends Base { static tableName = 'identities'; diff --git a/packages/backend/src/models/permission.js b/packages/backend/src/models/permission.js index 9bfab2e9..7ebd79c0 100644 --- a/packages/backend/src/models/permission.js +++ b/packages/backend/src/models/permission.js @@ -1,4 +1,4 @@ -import Base from './base'; +import Base from './base.js'; class Permission extends Base { static tableName = 'permissions'; diff --git a/packages/backend/src/models/role.js b/packages/backend/src/models/role.js index d8796058..af6ccafa 100644 --- a/packages/backend/src/models/role.js +++ b/packages/backend/src/models/role.js @@ -1,6 +1,6 @@ -import Base from './base'; -import Permission from './permission'; -import User from './user'; +import Base from './base.js'; +import Permission from './permission.js'; +import User from './user.js'; class Role extends Base { static tableName = 'roles'; diff --git a/packages/backend/src/models/saml-auth-provider.ee.js b/packages/backend/src/models/saml-auth-provider.ee.js index f586ca8e..21577dc7 100644 --- a/packages/backend/src/models/saml-auth-provider.ee.js +++ b/packages/backend/src/models/saml-auth-provider.ee.js @@ -1,8 +1,8 @@ import { URL } from 'node:url'; -import appConfig from '../config/app'; -import Base from './base'; -import Identity from './identity.ee'; -import SamlAuthProvidersRoleMapping from './saml-auth-providers-role-mapping.ee'; +import appConfig from '../config/app.js'; +import Base from './base.js'; +import Identity from './identity.ee.js'; +import SamlAuthProvidersRoleMapping from './saml-auth-providers-role-mapping.ee.js'; class SamlAuthProvider extends Base { static tableName = 'saml_auth_providers'; diff --git a/packages/backend/src/models/saml-auth-providers-role-mapping.ee.js b/packages/backend/src/models/saml-auth-providers-role-mapping.ee.js index a7179d1d..00e11bb0 100644 --- a/packages/backend/src/models/saml-auth-providers-role-mapping.ee.js +++ b/packages/backend/src/models/saml-auth-providers-role-mapping.ee.js @@ -1,5 +1,5 @@ -import Base from './base'; -import SamlAuthProvider from './saml-auth-provider.ee'; +import Base from './base.js'; +import SamlAuthProvider from './saml-auth-provider.ee.js'; class SamlAuthProvidersRoleMapping extends Base { static tableName = 'saml_auth_providers_role_mappings'; diff --git a/packages/backend/src/models/step.js b/packages/backend/src/models/step.js index 7b1a0b84..03af3312 100644 --- a/packages/backend/src/models/step.js +++ b/packages/backend/src/models/step.js @@ -1,12 +1,12 @@ import { URL } from 'node:url'; import get from 'lodash.get'; -import Base from './base'; -import App from './app'; -import Flow from './flow'; -import Connection from './connection'; -import ExecutionStep from './execution-step'; -import Telemetry from '../helpers/telemetry'; -import appConfig from '../config/app'; +import Base from './base.js'; +import App from './app.js'; +import Flow from './flow.js'; +import Connection from './connection.js'; +import ExecutionStep from './execution-step.js'; +import Telemetry from '../helpers/telemetry/index.js'; +import appConfig from '../config/app.js'; class Step extends Base { static tableName = 'steps'; diff --git a/packages/backend/src/models/subscription.ee.js b/packages/backend/src/models/subscription.ee.js index c186a65d..bcacf827 100644 --- a/packages/backend/src/models/subscription.ee.js +++ b/packages/backend/src/models/subscription.ee.js @@ -1,8 +1,8 @@ -import Base from './base'; -import User from './user'; -import UsageData from './usage-data.ee'; +import Base from './base.js'; +import User from './user.js'; +import UsageData from './usage-data.ee.js'; import { DateTime } from 'luxon'; -import { getPlanById } from '../helpers/billing/plans.ee'; +import { getPlanById } from '../helpers/billing/plans.ee.js'; class Subscription extends Base { static tableName = 'subscriptions'; diff --git a/packages/backend/src/models/usage-data.ee.js b/packages/backend/src/models/usage-data.ee.js index 8582ed27..eebfea37 100644 --- a/packages/backend/src/models/usage-data.ee.js +++ b/packages/backend/src/models/usage-data.ee.js @@ -1,7 +1,7 @@ import { raw } from 'objection'; -import Base from './base'; -import User from './user'; -import Subscription from './subscription.ee'; +import Base from './base.js'; +import User from './user.js'; +import Subscription from './subscription.ee.js'; class UsageData extends Base { static tableName = 'usage_data'; diff --git a/packages/backend/src/models/user.js b/packages/backend/src/models/user.js index cb9c0cac..b1a82a71 100644 --- a/packages/backend/src/models/user.js +++ b/packages/backend/src/models/user.js @@ -2,19 +2,19 @@ import bcrypt from 'bcrypt'; import { DateTime } from 'luxon'; import crypto from 'node:crypto'; -import appConfig from '../config/app'; -import { hasValidLicense } from '../helpers/license.ee'; -import userAbility from '../helpers/user-ability'; -import Base from './base'; -import Connection from './connection'; -import Execution from './execution'; -import Flow from './flow'; -import Identity from './identity.ee'; -import Permission from './permission'; -import Role from './role'; -import Step from './step'; -import Subscription from './subscription.ee'; -import UsageData from './usage-data.ee'; +import appConfig from '../config/app.js'; +import { hasValidLicense } from '../helpers/license.ee.js'; +import userAbility from '../helpers/user-ability.js'; +import Base from './base.js'; +import Connection from './connection.js'; +import Execution from './execution.js'; +import Flow from './flow.js'; +import Identity from './identity.ee.js'; +import Permission from './permission.js'; +import Role from './role.js'; +import Step from './step.js'; +import Subscription from './subscription.ee.js'; +import UsageData from './usage-data.ee.js'; class User extends Base { static tableName = 'users'; diff --git a/packages/backend/src/queues/action.js b/packages/backend/src/queues/action.js index 48173bf9..f693e9ac 100644 --- a/packages/backend/src/queues/action.js +++ b/packages/backend/src/queues/action.js @@ -1,7 +1,7 @@ import process from 'process'; import { Queue } from 'bullmq'; -import redisConfig from '../config/redis'; -import logger from '../helpers/logger'; +import redisConfig from '../config/redis.js'; +import logger from '../helpers/logger.js'; const CONNECTION_REFUSED = 'ECONNREFUSED'; diff --git a/packages/backend/src/queues/flow.js b/packages/backend/src/queues/flow.js index bd977955..61fb733c 100644 --- a/packages/backend/src/queues/flow.js +++ b/packages/backend/src/queues/flow.js @@ -1,7 +1,7 @@ import process from 'process'; import { Queue } from 'bullmq'; -import redisConfig from '../config/redis'; -import logger from '../helpers/logger'; +import redisConfig from '../config/redis.js'; +import logger from '../helpers/logger.js'; const CONNECTION_REFUSED = 'ECONNREFUSED'; diff --git a/packages/backend/src/queues/trigger.js b/packages/backend/src/queues/trigger.js index 522c0946..e816272b 100644 --- a/packages/backend/src/queues/trigger.js +++ b/packages/backend/src/queues/trigger.js @@ -1,7 +1,7 @@ import process from 'process'; import { Queue } from 'bullmq'; -import redisConfig from '../config/redis'; -import logger from '../helpers/logger'; +import redisConfig from '../config/redis.js'; +import logger from '../helpers/logger.js'; const CONNECTION_REFUSED = 'ECONNREFUSED'; diff --git a/packages/backend/src/services/action.js b/packages/backend/src/services/action.js index 33c45bcf..4bc5fac1 100644 --- a/packages/backend/src/services/action.js +++ b/packages/backend/src/services/action.js @@ -1,13 +1,13 @@ -import Step from '../models/step'; -import Flow from '../models/flow'; -import Execution from '../models/execution'; -import ExecutionStep from '../models/execution-step'; -import computeParameters from '../helpers/compute-parameters'; -import globalVariable from '../helpers/global-variable'; -import { logger } from '../helpers/logger'; -import HttpError from '../errors/http'; -import EarlyExitError from '../errors/early-exit'; -import AlreadyProcessedError from '../errors/already-processed'; +import Step from '../models/step.js'; +import Flow from '../models/flow.js'; +import Execution from '../models/execution.js'; +import ExecutionStep from '../models/execution-step.js'; +import computeParameters from '../helpers/compute-parameters.js'; +import globalVariable from '../helpers/global-variable.js'; +import { logger } from '../helpers/logger.js'; +import HttpError from '../errors/http.js'; +import EarlyExitError from '../errors/early-exit.js'; +import AlreadyProcessedError from '../errors/already-processed.js'; export const processAction = async (options) => { const { flowId, stepId, executionId } = options; diff --git a/packages/backend/src/services/flow.js b/packages/backend/src/services/flow.js index 769fcd3b..e257009e 100644 --- a/packages/backend/src/services/flow.js +++ b/packages/backend/src/services/flow.js @@ -1,9 +1,9 @@ -import Flow from '../models/flow'; -import globalVariable from '../helpers/global-variable'; -import EarlyExitError from '../errors/early-exit'; -import AlreadyProcessedError from '../errors/already-processed'; -import HttpError from '../errors/http'; -import { logger } from '../helpers/logger'; +import Flow from '../models/flow.js'; +import globalVariable from '../helpers/global-variable.js'; +import EarlyExitError from '../errors/early-exit.js'; +import AlreadyProcessedError from '../errors/already-processed.js'; +import HttpError from '../errors/http.js'; +import { logger } from '../helpers/logger.js'; export const processFlow = async (options) => { const { testRun, flowId } = options; diff --git a/packages/backend/src/services/trigger.js b/packages/backend/src/services/trigger.js index f9c37432..075a9fc3 100644 --- a/packages/backend/src/services/trigger.js +++ b/packages/backend/src/services/trigger.js @@ -1,7 +1,7 @@ -import Step from '../models/step'; -import Flow from '../models/flow'; -import Execution from '../models/execution'; -import globalVariable from '../helpers/global-variable'; +import Step from '../models/step.js'; +import Flow from '../models/flow.js'; +import Execution from '../models/execution.js'; +import globalVariable from '../helpers/global-variable.js'; export const processTrigger = async (options) => { const { flowId, stepId, triggerItem, error, testRun } = options; diff --git a/packages/backend/src/worker.js b/packages/backend/src/worker.js index 4de664e5..988cb0cc 100644 --- a/packages/backend/src/worker.js +++ b/packages/backend/src/worker.js @@ -1,21 +1,21 @@ -import * as Sentry from './helpers/sentry.ee'; -import appConfig from './config/app'; +import * as Sentry from './helpers/sentry.ee.js'; +import appConfig from './config/app.js'; Sentry.init(); -import './config/orm'; -import './helpers/check-worker-readiness'; -import './workers/flow'; -import './workers/trigger'; -import './workers/action'; -import './workers/email'; -import './workers/delete-user.ee'; +import './config/orm.js'; +import './helpers/check-worker-readiness.js'; +import './workers/flow.js'; +import './workers/trigger.js'; +import './workers/action.js'; +import './workers/email.js'; +import './workers/delete-user.ee.js'; if (appConfig.isCloud) { - import('./workers/remove-cancelled-subscriptions.ee'); - import('./queues/remove-cancelled-subscriptions.ee'); + import('./workers/remove-cancelled-subscriptions.ee.js'); + import('./queues/remove-cancelled-subscriptions.ee.js'); } -import telemetry from './helpers/telemetry'; +import telemetry from './helpers/telemetry/index.js'; telemetry.setServiceType('worker'); diff --git a/packages/backend/src/workers/action.js b/packages/backend/src/workers/action.js index d5bd1cf1..9564d9a4 100644 --- a/packages/backend/src/workers/action.js +++ b/packages/backend/src/workers/action.js @@ -1,17 +1,17 @@ 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 Step from '../models/step'; -import actionQueue from '../queues/action'; -import { processAction } from '../services/action'; +import * as Sentry from '../helpers/sentry.ee.js'; +import redisConfig from '../config/redis.js'; +import logger from '../helpers/logger.js'; +import Step from '../models/step.js'; +import actionQueue from '../queues/action.js'; +import { processAction } from '../services/action.js'; import { REMOVE_AFTER_30_DAYS_OR_150_JOBS, REMOVE_AFTER_7_DAYS_OR_50_JOBS, -} from '../helpers/remove-job-configuration'; -import delayAsMilliseconds from '../helpers/delay-as-milliseconds'; +} from '../helpers/remove-job-configuration.js'; +import delayAsMilliseconds from '../helpers/delay-as-milliseconds.js'; const DEFAULT_DELAY_DURATION = 0; diff --git a/packages/backend/src/workers/delete-user.ee.js b/packages/backend/src/workers/delete-user.ee.js index c18d3bb4..b033c183 100644 --- a/packages/backend/src/workers/delete-user.ee.js +++ b/packages/backend/src/workers/delete-user.ee.js @@ -1,12 +1,12 @@ 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 ExecutionStep from '../models/execution-step'; +import * as Sentry from '../helpers/sentry.ee.js'; +import redisConfig from '../config/redis.js'; +import logger from '../helpers/logger.js'; +import appConfig from '../config/app.js'; +import User from '../models/user.js'; +import ExecutionStep from '../models/execution-step.js'; export const worker = new Worker( 'delete-user', diff --git a/packages/backend/src/workers/email.js b/packages/backend/src/workers/email.js index 1db4562d..e1297376 100644 --- a/packages/backend/src/workers/email.js +++ b/packages/backend/src/workers/email.js @@ -1,12 +1,12 @@ 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 mailer from '../helpers/mailer.ee'; -import compileEmail from '../helpers/compile-email.ee'; -import appConfig from '../config/app'; +import * as Sentry from '../helpers/sentry.ee.js'; +import redisConfig from '../config/redis.js'; +import logger from '../helpers/logger.js'; +import mailer from '../helpers/mailer.ee.js'; +import compileEmail from '../helpers/compile-email.ee.js'; +import appConfig from '../config/app.js'; const isCloudSandbox = () => { return appConfig.isCloud && !appConfig.isProd; diff --git a/packages/backend/src/workers/flow.js b/packages/backend/src/workers/flow.js index 22974465..b1bcce78 100644 --- a/packages/backend/src/workers/flow.js +++ b/packages/backend/src/workers/flow.js @@ -1,17 +1,17 @@ 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 flowQueue from '../queues/flow'; -import triggerQueue from '../queues/trigger'; -import { processFlow } from '../services/flow'; -import Flow from '../models/flow'; +import * as Sentry from '../helpers/sentry.ee.js'; +import redisConfig from '../config/redis.js'; +import logger from '../helpers/logger.js'; +import flowQueue from '../queues/flow.js'; +import triggerQueue from '../queues/trigger.js'; +import { processFlow } from '../services/flow.js'; +import Flow from '../models/flow.js'; import { REMOVE_AFTER_30_DAYS_OR_150_JOBS, REMOVE_AFTER_7_DAYS_OR_50_JOBS, -} from '../helpers/remove-job-configuration'; +} from '../helpers/remove-job-configuration.js'; export const worker = new Worker( 'flow', diff --git a/packages/backend/src/workers/trigger.js b/packages/backend/src/workers/trigger.js index dbe299ef..58749f75 100644 --- a/packages/backend/src/workers/trigger.js +++ b/packages/backend/src/workers/trigger.js @@ -1,16 +1,16 @@ 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 actionQueue from '../queues/action'; -import Step from '../models/step'; -import { processTrigger } from '../services/trigger'; +import * as Sentry from '../helpers/sentry.ee.js'; +import redisConfig from '../config/redis.js'; +import logger from '../helpers/logger.js'; +import actionQueue from '../queues/action.js'; +import Step from '../models/step.js'; +import { processTrigger } from '../services/trigger.js'; import { REMOVE_AFTER_30_DAYS_OR_150_JOBS, REMOVE_AFTER_7_DAYS_OR_50_JOBS, -} from '../helpers/remove-job-configuration'; +} from '../helpers/remove-job-configuration.js'; export const worker = new Worker( 'trigger',