diff --git a/packages/@n8n/backend-common/package.json b/packages/@n8n/backend-common/package.json index 802fab5293..34de0b3ee4 100644 --- a/packages/@n8n/backend-common/package.json +++ b/packages/@n8n/backend-common/package.json @@ -21,10 +21,14 @@ "dist/**/*" ], "dependencies": { + "@n8n/config": "workspace:^", "@n8n/constants": "workspace:^", "@n8n/di": "workspace:^", + "callsites": "catalog:", "n8n-workflow": "workspace:^", - "reflect-metadata": "catalog:" + "picocolors": "catalog:", + "reflect-metadata": "catalog:", + "winston": "3.14.2" }, "devDependencies": { "@n8n/typescript-config": "workspace:*" diff --git a/packages/@n8n/backend-common/src/environment.ts b/packages/@n8n/backend-common/src/environment.ts new file mode 100644 index 0000000000..80b8553a46 --- /dev/null +++ b/packages/@n8n/backend-common/src/environment.ts @@ -0,0 +1,5 @@ +const { NODE_ENV } = process.env; + +export const inTest = NODE_ENV === 'test'; +export const inProduction = NODE_ENV === 'production'; +export const inDevelopment = !NODE_ENV || NODE_ENV === 'development'; diff --git a/packages/@n8n/backend-common/src/index.ts b/packages/@n8n/backend-common/src/index.ts index f135141c17..f198301b04 100644 --- a/packages/@n8n/backend-common/src/index.ts +++ b/packages/@n8n/backend-common/src/index.ts @@ -1,10 +1,6 @@ export * from './license-state'; export * from './types'; -const { NODE_ENV } = process.env; - -export const inTest = NODE_ENV === 'test'; -export const inProduction = NODE_ENV === 'production'; -export const inDevelopment = !NODE_ENV || NODE_ENV === 'development'; - +export { inDevelopment, inProduction, inTest } from './environment'; export { isObjectLiteral } from './utils/is-object-literal'; +export { Logger } from './logging/logger'; diff --git a/packages/core/src/logging/__tests__/logger.test.ts b/packages/@n8n/backend-common/src/logging/__tests__/logger.test.ts similarity index 100% rename from packages/core/src/logging/__tests__/logger.test.ts rename to packages/@n8n/backend-common/src/logging/__tests__/logger.test.ts diff --git a/packages/core/src/logging/index.ts b/packages/@n8n/backend-common/src/logging/index.ts similarity index 100% rename from packages/core/src/logging/index.ts rename to packages/@n8n/backend-common/src/logging/index.ts diff --git a/packages/core/src/logging/logger.ts b/packages/@n8n/backend-common/src/logging/logger.ts similarity index 98% rename from packages/core/src/logging/logger.ts rename to packages/@n8n/backend-common/src/logging/logger.ts index e8b8f3f4a0..08b75ced51 100644 --- a/packages/core/src/logging/logger.ts +++ b/packages/@n8n/backend-common/src/logging/logger.ts @@ -1,4 +1,3 @@ -import { inDevelopment, inProduction, isObjectLiteral } from '@n8n/backend-common'; import type { LogScope } from '@n8n/config'; import { GlobalConfig, InstanceSettingsConfig } from '@n8n/config'; import { Service } from '@n8n/di'; @@ -15,6 +14,9 @@ import path, { basename } from 'node:path'; import pc from 'picocolors'; import winston from 'winston'; +import { inDevelopment, inProduction } from '../environment'; +import { isObjectLiteral } from '../utils/is-object-literal'; + const noOp = () => {}; @Service() diff --git a/packages/@n8n/db/src/migrations/migration-helpers.ts b/packages/@n8n/db/src/migrations/migration-helpers.ts index f7a8e6e28b..1a8130a0d4 100644 --- a/packages/@n8n/db/src/migrations/migration-helpers.ts +++ b/packages/@n8n/db/src/migrations/migration-helpers.ts @@ -1,9 +1,10 @@ +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { Container } from '@n8n/di'; import type { ObjectLiteral } from '@n8n/typeorm'; import type { QueryRunner } from '@n8n/typeorm/query-runner/QueryRunner'; import { readFileSync, rmSync } from 'fs'; -import { InstanceSettings, Logger } from 'n8n-core'; +import { InstanceSettings } from 'n8n-core'; import { jsonParse, UnexpectedError } from 'n8n-workflow'; import { createSchemaBuilder } from './dsl'; diff --git a/packages/@n8n/db/src/migrations/migration-types.ts b/packages/@n8n/db/src/migrations/migration-types.ts index 9eed747492..7abd0b5aa4 100644 --- a/packages/@n8n/db/src/migrations/migration-types.ts +++ b/packages/@n8n/db/src/migrations/migration-types.ts @@ -1,5 +1,5 @@ +import type { Logger } from '@n8n/backend-common'; import type { QueryRunner, ObjectLiteral } from '@n8n/typeorm'; -import type { Logger } from 'n8n-core'; import type { createSchemaBuilder } from './dsl'; diff --git a/packages/@n8n/db/src/repositories/execution.repository.ts b/packages/@n8n/db/src/repositories/execution.repository.ts index 8e02b88656..2d563cf2d3 100644 --- a/packages/@n8n/db/src/repositories/execution.repository.ts +++ b/packages/@n8n/db/src/repositories/execution.repository.ts @@ -1,3 +1,4 @@ +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { Service } from '@n8n/di'; import type { @@ -22,7 +23,7 @@ import { import { DateUtils } from '@n8n/typeorm/util/DateUtils'; import { parse, stringify } from 'flatted'; import pick from 'lodash/pick'; -import { BinaryDataService, ErrorReporter, Logger } from 'n8n-core'; +import { BinaryDataService, ErrorReporter } from 'n8n-core'; import { ExecutionCancelledError, UnexpectedError } from 'n8n-workflow'; import type { AnnotationVote, diff --git a/packages/@n8n/db/src/subscribers/user-subscriber.ts b/packages/@n8n/db/src/subscribers/user-subscriber.ts index 56d69c135f..f889c733e0 100644 --- a/packages/@n8n/db/src/subscribers/user-subscriber.ts +++ b/packages/@n8n/db/src/subscribers/user-subscriber.ts @@ -1,7 +1,8 @@ +import { Logger } from '@n8n/backend-common'; import { Container } from '@n8n/di'; import type { EntitySubscriberInterface, UpdateEvent } from '@n8n/typeorm'; import { EventSubscriber } from '@n8n/typeorm'; -import { ErrorReporter, Logger } from 'n8n-core'; +import { ErrorReporter } from 'n8n-core'; import { UnexpectedError } from 'n8n-workflow'; import { Project, User } from '../entities'; diff --git a/packages/cli/src/__tests__/credentials-overwrites.test.ts b/packages/cli/src/__tests__/credentials-overwrites.test.ts index c9a4f2fb27..493dbc49dc 100644 --- a/packages/cli/src/__tests__/credentials-overwrites.test.ts +++ b/packages/cli/src/__tests__/credentials-overwrites.test.ts @@ -1,6 +1,7 @@ +import type { Logger } from '@n8n/backend-common'; import type { GlobalConfig } from '@n8n/config'; import { mock } from 'jest-mock-extended'; -import { UnrecognizedCredentialTypeError, type Logger } from 'n8n-core'; +import { UnrecognizedCredentialTypeError } from 'n8n-core'; import type { ICredentialType } from 'n8n-workflow'; import type { CredentialTypes } from '@/credential-types'; diff --git a/packages/cli/src/__tests__/external-hooks.test.ts b/packages/cli/src/__tests__/external-hooks.test.ts index 28781d86d6..542bc7cdba 100644 --- a/packages/cli/src/__tests__/external-hooks.test.ts +++ b/packages/cli/src/__tests__/external-hooks.test.ts @@ -1,9 +1,10 @@ +import type { Logger } from '@n8n/backend-common'; import type { GlobalConfig } from '@n8n/config'; import type { WorkflowRepository } from '@n8n/db'; import type { CredentialsRepository, SettingsRepository } from '@n8n/db'; import type { UserRepository } from '@n8n/db'; import { mock } from 'jest-mock-extended'; -import type { ErrorReporter, Logger } from 'n8n-core'; +import type { ErrorReporter } from 'n8n-core'; import type { IWorkflowBase } from 'n8n-workflow'; import { UnexpectedError } from 'n8n-workflow'; diff --git a/packages/cli/src/abstract-server.ts b/packages/cli/src/abstract-server.ts index 6316826ea7..bb9f6954a7 100644 --- a/packages/cli/src/abstract-server.ts +++ b/packages/cli/src/abstract-server.ts @@ -1,4 +1,4 @@ -import { inTest, inDevelopment } from '@n8n/backend-common'; +import { inTest, inDevelopment, Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { OnShutdown } from '@n8n/decorators'; import { Container, Service } from '@n8n/di'; @@ -8,7 +8,6 @@ import { engine as expressHandlebars } from 'express-handlebars'; import { readFile } from 'fs/promises'; import type { Server } from 'http'; import isbot from 'isbot'; -import { Logger } from 'n8n-core'; import config from '@/config'; import { N8N_VERSION, TEMPLATES_DIR } from '@/constants'; diff --git a/packages/cli/src/active-executions.ts b/packages/cli/src/active-executions.ts index 6282993313..ecc9364dec 100644 --- a/packages/cli/src/active-executions.ts +++ b/packages/cli/src/active-executions.ts @@ -1,7 +1,7 @@ +import { Logger } from '@n8n/backend-common'; import type { CreateExecutionPayload, IExecutionDb } from '@n8n/db'; import { ExecutionRepository } from '@n8n/db'; import { Service } from '@n8n/di'; -import { Logger } from 'n8n-core'; import type { IDeferredPromise, IExecuteResponsePromiseData, diff --git a/packages/cli/src/active-workflow-manager.ts b/packages/cli/src/active-workflow-manager.ts index ad52c57a6e..02a2cadee6 100644 --- a/packages/cli/src/active-workflow-manager.ts +++ b/packages/cli/src/active-workflow-manager.ts @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ +import { Logger } from '@n8n/backend-common'; import { WorkflowsConfig } from '@n8n/config'; import type { WorkflowEntity, IWorkflowDb } from '@n8n/db'; import { WorkflowRepository } from '@n8n/db'; @@ -9,7 +10,6 @@ import { ActiveWorkflows, ErrorReporter, InstanceSettings, - Logger, PollContext, TriggerContext, type IGetExecutePollFunctions, diff --git a/packages/cli/src/auth/auth.service.ts b/packages/cli/src/auth/auth.service.ts index f0a3b99283..da627dfd80 100644 --- a/packages/cli/src/auth/auth.service.ts +++ b/packages/cli/src/auth/auth.service.ts @@ -1,3 +1,4 @@ +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import type { User } from '@n8n/db'; import { InvalidAuthTokenRepository, UserRepository } from '@n8n/db'; @@ -6,7 +7,6 @@ import { createHash } from 'crypto'; import type { NextFunction, Response } from 'express'; import { JsonWebTokenError, TokenExpiredError } from 'jsonwebtoken'; import type { StringValue as TimeUnitValue } from 'ms'; -import { Logger } from 'n8n-core'; import config from '@/config'; import { AUTH_COOKIE_NAME, RESPONSE_ERROR_MESSAGES, Time } from '@/constants'; diff --git a/packages/cli/src/commands/base-command.ts b/packages/cli/src/commands/base-command.ts index 2709dba98b..aa258d1fec 100644 --- a/packages/cli/src/commands/base-command.ts +++ b/packages/cli/src/commands/base-command.ts @@ -1,5 +1,5 @@ import 'reflect-metadata'; -import { inDevelopment, inTest, LicenseState } from '@n8n/backend-common'; +import { inDevelopment, inTest, LicenseState, Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { LICENSE_FEATURES } from '@n8n/constants'; import { Container } from '@n8n/di'; @@ -8,7 +8,6 @@ import { BinaryDataConfig, BinaryDataService, InstanceSettings, - Logger, ObjectStoreService, DataDeduplicationService, ErrorReporter, diff --git a/packages/cli/src/commands/db/__tests__/revert.test.ts b/packages/cli/src/commands/db/__tests__/revert.test.ts index 314fb08038..2972caa7ea 100644 --- a/packages/cli/src/commands/db/__tests__/revert.test.ts +++ b/packages/cli/src/commands/db/__tests__/revert.test.ts @@ -1,8 +1,8 @@ +import { Logger } from '@n8n/backend-common'; import type { IrreversibleMigration, ReversibleMigration } from '@n8n/db'; import type { Migration, MigrationExecutor } from '@n8n/typeorm'; import { type DataSource } from '@n8n/typeorm'; import { mock } from 'jest-mock-extended'; -import { Logger } from 'n8n-core'; import { main } from '@/commands/db/revert'; import { mockInstance } from '@test/mocking'; diff --git a/packages/cli/src/commands/db/revert.ts b/packages/cli/src/commands/db/revert.ts index 6f6365f936..99565ef1a6 100644 --- a/packages/cli/src/commands/db/revert.ts +++ b/packages/cli/src/commands/db/revert.ts @@ -1,3 +1,4 @@ +import { Logger } from '@n8n/backend-common'; import type { Migration } from '@n8n/db'; import { wrapMigration } from '@n8n/db'; import { Container } from '@n8n/di'; @@ -6,7 +7,6 @@ import type { DataSourceOptions as ConnectionOptions } from '@n8n/typeorm'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import import { MigrationExecutor, DataSource as Connection } from '@n8n/typeorm'; import { Command, Flags } from '@oclif/core'; -import { Logger } from 'n8n-core'; import { DbConnectionOptions } from '@/databases/db-connection-options'; diff --git a/packages/cli/src/concurrency/concurrency-control.service.ts b/packages/cli/src/concurrency/concurrency-control.service.ts index 920050405a..73aaad2bd2 100644 --- a/packages/cli/src/concurrency/concurrency-control.service.ts +++ b/packages/cli/src/concurrency/concurrency-control.service.ts @@ -1,7 +1,7 @@ +import { Logger } from '@n8n/backend-common'; import { ExecutionRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import { capitalize } from 'lodash'; -import { Logger } from 'n8n-core'; import type { WorkflowExecuteMode as ExecutionMode } from 'n8n-workflow'; import config from '@/config'; diff --git a/packages/cli/src/config/index.ts b/packages/cli/src/config/index.ts index 77162a9213..031cb01e08 100644 --- a/packages/cli/src/config/index.ts +++ b/packages/cli/src/config/index.ts @@ -1,11 +1,10 @@ -import { inTest } from '@n8n/backend-common'; +import { inTest, Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { Container } from '@n8n/di'; import convict from 'convict'; import { flatten } from 'flat'; import { readFileSync } from 'fs'; import merge from 'lodash/merge'; -import { Logger } from 'n8n-core'; import { setGlobalState, UserError } from 'n8n-workflow'; import assert from 'node:assert'; diff --git a/packages/cli/src/controllers/__tests__/auth.controller.test.ts b/packages/cli/src/controllers/__tests__/auth.controller.test.ts index c8d98cedc2..e672b4a1ad 100644 --- a/packages/cli/src/controllers/__tests__/auth.controller.test.ts +++ b/packages/cli/src/controllers/__tests__/auth.controller.test.ts @@ -1,10 +1,10 @@ import type { LoginRequestDto } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import type { User } from '@n8n/db'; import { UserRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import type { Response } from 'express'; import { mock } from 'jest-mock-extended'; -import { Logger } from 'n8n-core'; import * as auth from '@/auth'; import { AuthService } from '@/auth/auth.service'; diff --git a/packages/cli/src/controllers/__tests__/owner.controller.test.ts b/packages/cli/src/controllers/__tests__/owner.controller.test.ts index be83ba15aa..66bb1a5762 100644 --- a/packages/cli/src/controllers/__tests__/owner.controller.test.ts +++ b/packages/cli/src/controllers/__tests__/owner.controller.test.ts @@ -1,10 +1,10 @@ import type { DismissBannerRequestDto, OwnerSetupRequestDto } from '@n8n/api-types'; +import type { Logger } from '@n8n/backend-common'; import type { User } from '@n8n/db'; import type { PublicUser, SettingsRepository } from '@n8n/db'; import type { UserRepository } from '@n8n/db'; import type { Response } from 'express'; import { mock } from 'jest-mock-extended'; -import type { Logger } from 'n8n-core'; import type { AuthService } from '@/auth/auth.service'; import config from '@/config'; diff --git a/packages/cli/src/controllers/auth.controller.ts b/packages/cli/src/controllers/auth.controller.ts index bdaa4630dc..a313b36a7a 100644 --- a/packages/cli/src/controllers/auth.controller.ts +++ b/packages/cli/src/controllers/auth.controller.ts @@ -1,10 +1,10 @@ import { LoginRequestDto, ResolveSignupTokenQueryDto } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import type { User, PublicUser } from '@n8n/db'; import { UserRepository } from '@n8n/db'; import { Body, Get, Post, Query, RestController } from '@n8n/decorators'; import { isEmail } from 'class-validator'; import { Response } from 'express'; -import { Logger } from 'n8n-core'; import { handleEmailLogin, handleLdapLogin } from '@/auth'; import { AuthService } from '@/auth/auth.service'; diff --git a/packages/cli/src/controllers/e2e.controller.ts b/packages/cli/src/controllers/e2e.controller.ts index 6dbe37aaf0..50d55923a4 100644 --- a/packages/cli/src/controllers/e2e.controller.ts +++ b/packages/cli/src/controllers/e2e.controller.ts @@ -1,11 +1,11 @@ import type { PushMessage } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import type { BooleanLicenseFeature, NumericLicenseFeature } from '@n8n/constants'; import { LICENSE_FEATURES, LICENSE_QUOTAS, UNLIMITED_LICENSE_QUOTA } from '@n8n/constants'; import { SettingsRepository, UserRepository } from '@n8n/db'; import { Patch, Post, RestController } from '@n8n/decorators'; import { Container } from '@n8n/di'; import { Request } from 'express'; -import { Logger } from 'n8n-core'; import { v4 as uuid } from 'uuid'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; diff --git a/packages/cli/src/controllers/invitation.controller.ts b/packages/cli/src/controllers/invitation.controller.ts index 5f0238b074..00468b4d2a 100644 --- a/packages/cli/src/controllers/invitation.controller.ts +++ b/packages/cli/src/controllers/invitation.controller.ts @@ -1,9 +1,9 @@ import { AcceptInvitationRequestDto, InviteUsersRequestDto } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import type { User } from '@n8n/db'; import { UserRepository } from '@n8n/db'; import { Post, GlobalScope, RestController, Body, Param } from '@n8n/decorators'; import { Response } from 'express'; -import { Logger } from 'n8n-core'; import { AuthService } from '@/auth/auth.service'; import config from '@/config'; diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts index 6f0e07a123..d5c0f2d94e 100644 --- a/packages/cli/src/controllers/me.controller.ts +++ b/packages/cli/src/controllers/me.controller.ts @@ -4,12 +4,12 @@ import { SettingsUpdateRequestDto, UserUpdateRequestDto, } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import type { User, PublicUser } from '@n8n/db'; import { UserRepository } from '@n8n/db'; import { Body, Patch, Post, RestController } from '@n8n/decorators'; import { plainToInstance } from 'class-transformer'; import { Response } from 'express'; -import { Logger } from 'n8n-core'; import { AuthService } from '@/auth/auth.service'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; diff --git a/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts index ffbb39a8b8..a714cf2431 100644 --- a/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts +++ b/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts @@ -1,3 +1,4 @@ +import { Logger } from '@n8n/backend-common'; import type { CredentialsEntity } from '@n8n/db'; import type { User } from '@n8n/db'; import { CredentialsRepository } from '@n8n/db'; @@ -5,7 +6,7 @@ import { Container } from '@n8n/di'; import Csrf from 'csrf'; import type { Response } from 'express'; import { captor, mock } from 'jest-mock-extended'; -import { Cipher, type InstanceSettings, Logger } from 'n8n-core'; +import { Cipher, type InstanceSettings } from 'n8n-core'; import type { IWorkflowExecuteAdditionalData } from 'n8n-workflow'; import nock from 'nock'; diff --git a/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts index ab99f4f556..203fb1c1e0 100644 --- a/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts +++ b/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts @@ -1,3 +1,4 @@ +import { Logger } from '@n8n/backend-common'; import type { CredentialsEntity } from '@n8n/db'; import type { User } from '@n8n/db'; import { CredentialsRepository } from '@n8n/db'; @@ -5,7 +6,7 @@ import { Container } from '@n8n/di'; import Csrf from 'csrf'; import { type Response } from 'express'; import { captor, mock } from 'jest-mock-extended'; -import { Cipher, type InstanceSettings, Logger } from 'n8n-core'; +import { Cipher, type InstanceSettings } from 'n8n-core'; import type { IWorkflowExecuteAdditionalData } from 'n8n-workflow'; import nock from 'nock'; diff --git a/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts b/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts index dc819871fd..a79bbe870e 100644 --- a/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts +++ b/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts @@ -1,10 +1,11 @@ +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import type { CredentialsEntity, ICredentialsDb } from '@n8n/db'; import { CredentialsRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import Csrf from 'csrf'; import type { Response } from 'express'; -import { Credentials, Logger } from 'n8n-core'; +import { Credentials } from 'n8n-core'; import type { ICredentialDataDecryptedObject, IWorkflowExecuteAdditionalData } from 'n8n-workflow'; import { jsonParse, UnexpectedError } from 'n8n-workflow'; diff --git a/packages/cli/src/controllers/owner.controller.ts b/packages/cli/src/controllers/owner.controller.ts index 7c5973faa3..ad27d9f726 100644 --- a/packages/cli/src/controllers/owner.controller.ts +++ b/packages/cli/src/controllers/owner.controller.ts @@ -1,8 +1,8 @@ import { DismissBannerRequestDto, OwnerSetupRequestDto } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import { SettingsRepository, UserRepository } from '@n8n/db'; import { Body, GlobalScope, Post, RestController } from '@n8n/decorators'; import { Response } from 'express'; -import { Logger } from 'n8n-core'; import { AuthService } from '@/auth/auth.service'; import config from '@/config'; diff --git a/packages/cli/src/controllers/password-reset.controller.ts b/packages/cli/src/controllers/password-reset.controller.ts index ddd7ae45d7..c3894f1c94 100644 --- a/packages/cli/src/controllers/password-reset.controller.ts +++ b/packages/cli/src/controllers/password-reset.controller.ts @@ -3,11 +3,11 @@ import { ForgotPasswordRequestDto, ResolvePasswordTokenQueryDto, } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import { UserRepository } from '@n8n/db'; import { Body, Get, Post, Query, RestController } from '@n8n/decorators'; import { hasGlobalScope } from '@n8n/permissions'; import { Response } from 'express'; -import { Logger } from 'n8n-core'; import { AuthService } from '@/auth/auth.service'; import { RESPONSE_ERROR_MESSAGES } from '@/constants'; diff --git a/packages/cli/src/controllers/users.controller.ts b/packages/cli/src/controllers/users.controller.ts index 0ffde3e279..2379b9a708 100644 --- a/packages/cli/src/controllers/users.controller.ts +++ b/packages/cli/src/controllers/users.controller.ts @@ -1,4 +1,5 @@ import { RoleChangeRequestDto, SettingsUpdateRequestDto } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import type { PublicUser } from '@n8n/db'; import { Project, @@ -20,7 +21,6 @@ import { Param, } from '@n8n/decorators'; import { Response } from 'express'; -import { Logger } from 'n8n-core'; import { AuthService } from '@/auth/auth.service'; import { CredentialsService } from '@/credentials/credentials.service'; diff --git a/packages/cli/src/controllers/workflow-statistics.controller.ts b/packages/cli/src/controllers/workflow-statistics.controller.ts index 174c0a70cc..fb1341de7e 100644 --- a/packages/cli/src/controllers/workflow-statistics.controller.ts +++ b/packages/cli/src/controllers/workflow-statistics.controller.ts @@ -1,8 +1,8 @@ +import { Logger } from '@n8n/backend-common'; import type { WorkflowStatistics } from '@n8n/db'; import { StatisticsNames, WorkflowStatisticsRepository } from '@n8n/db'; import { Get, Middleware, RestController } from '@n8n/decorators'; import { Response, NextFunction } from 'express'; -import { Logger } from 'n8n-core'; import { NotFoundError } from '@/errors/response-errors/not-found.error'; import type { IWorkflowStatisticsDataLoaded } from '@/interfaces'; diff --git a/packages/cli/src/crash-journal.ts b/packages/cli/src/crash-journal.ts index 8e80d56d1b..23c32a6098 100644 --- a/packages/cli/src/crash-journal.ts +++ b/packages/cli/src/crash-journal.ts @@ -1,8 +1,8 @@ -import { inProduction } from '@n8n/backend-common'; +import { inProduction, Logger } from '@n8n/backend-common'; import { Container } from '@n8n/di'; import { existsSync } from 'fs'; import { mkdir, utimes, open, rm } from 'fs/promises'; -import { InstanceSettings, Logger } from 'n8n-core'; +import { InstanceSettings } from 'n8n-core'; import { sleep } from 'n8n-workflow'; import { join, dirname } from 'path'; diff --git a/packages/cli/src/credentials-overwrites.ts b/packages/cli/src/credentials-overwrites.ts index 3ba1b8043c..917b18b5a1 100644 --- a/packages/cli/src/credentials-overwrites.ts +++ b/packages/cli/src/credentials-overwrites.ts @@ -1,6 +1,6 @@ +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { Service } from '@n8n/di'; -import { Logger } from 'n8n-core'; import type { ICredentialDataDecryptedObject } from 'n8n-workflow'; import { deepCopy, jsonParse } from 'n8n-workflow'; diff --git a/packages/cli/src/credentials/credentials.controller.ts b/packages/cli/src/credentials/credentials.controller.ts index 22bca57385..697b0b874e 100644 --- a/packages/cli/src/credentials/credentials.controller.ts +++ b/packages/cli/src/credentials/credentials.controller.ts @@ -4,6 +4,7 @@ import { CredentialsGetOneRequestQuery, GenerateCredentialNameRequestQuery, } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { SharedCredentials, ProjectRelationRepository, SharedCredentialsRepository } from '@n8n/db'; import { @@ -21,7 +22,6 @@ import { } from '@n8n/decorators'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import import { In } from '@n8n/typeorm'; -import { Logger } from 'n8n-core'; import { deepCopy } from 'n8n-workflow'; import type { ICredentialDataDecryptedObject } from 'n8n-workflow'; import { z } from 'zod'; diff --git a/packages/cli/src/credentials/credentials.service.ts b/packages/cli/src/credentials/credentials.service.ts index fb986f0723..8f7729cc14 100644 --- a/packages/cli/src/credentials/credentials.service.ts +++ b/packages/cli/src/credentials/credentials.service.ts @@ -1,4 +1,5 @@ import type { CreateCredentialDto } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import type { Project, User, ICredentialsDb, ScopesField } from '@n8n/db'; import { CredentialsEntity, @@ -17,7 +18,7 @@ import { type FindOptionsRelations, type FindOptionsWhere, } from '@n8n/typeorm'; -import { CredentialDataError, Credentials, ErrorReporter, Logger } from 'n8n-core'; +import { CredentialDataError, Credentials, ErrorReporter } from 'n8n-core'; import type { ICredentialDataDecryptedObject, ICredentialsDecrypted, diff --git a/packages/cli/src/deprecation/__tests__/deprecation.service.test.ts b/packages/cli/src/deprecation/__tests__/deprecation.service.test.ts index 5f4c8f8fc2..64fc68915c 100644 --- a/packages/cli/src/deprecation/__tests__/deprecation.service.test.ts +++ b/packages/cli/src/deprecation/__tests__/deprecation.service.test.ts @@ -1,6 +1,6 @@ +import type { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { captor, mock } from 'jest-mock-extended'; -import type { Logger } from 'n8n-core'; import config from '@/config'; import { mockInstance } from '@test/mocking'; diff --git a/packages/cli/src/deprecation/deprecation.service.ts b/packages/cli/src/deprecation/deprecation.service.ts index c4b2d5bb19..e76b64476d 100644 --- a/packages/cli/src/deprecation/deprecation.service.ts +++ b/packages/cli/src/deprecation/deprecation.service.ts @@ -1,6 +1,6 @@ +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { Service } from '@n8n/di'; -import { Logger } from 'n8n-core'; import config from '@/config'; diff --git a/packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts index 5fca88df37..0897e42e5c 100644 --- a/packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts +++ b/packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts @@ -1,4 +1,5 @@ import type { SourceControlledFile } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import type { IWorkflowDb } from '@n8n/db'; import { FolderRepository, @@ -12,7 +13,7 @@ import { Service } from '@n8n/di'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import import { In } from '@n8n/typeorm'; import { rmSync } from 'fs'; -import { Credentials, InstanceSettings, Logger } from 'n8n-core'; +import { Credentials, InstanceSettings } from 'n8n-core'; import { UnexpectedError, type ICredentialDataDecryptedObject } from 'n8n-workflow'; import { writeFile as fsWriteFile, rm as fsRm } from 'node:fs/promises'; import path from 'path'; diff --git a/packages/cli/src/environments.ee/source-control/source-control-git.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-git.service.ee.ts index 98c06a1051..7c28c1c524 100644 --- a/packages/cli/src/environments.ee/source-control/source-control-git.service.ee.ts +++ b/packages/cli/src/environments.ee/source-control/source-control-git.service.ee.ts @@ -1,7 +1,7 @@ +import { Logger } from '@n8n/backend-common'; import type { User } from '@n8n/db'; import { Service } from '@n8n/di'; import { execSync } from 'child_process'; -import { Logger } from 'n8n-core'; import { UnexpectedError } from 'n8n-workflow'; import path from 'path'; import type { diff --git a/packages/cli/src/environments.ee/source-control/source-control-helper.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-helper.ee.ts index bd83b23ca9..760ba2cafe 100644 --- a/packages/cli/src/environments.ee/source-control/source-control-helper.ee.ts +++ b/packages/cli/src/environments.ee/source-control/source-control-helper.ee.ts @@ -1,8 +1,8 @@ import type { SourceControlledFile } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import { Container } from '@n8n/di'; import { generateKeyPairSync } from 'crypto'; import { constants as fsConstants, mkdirSync, accessSync } from 'fs'; -import { Logger } from 'n8n-core'; import { UserError } from 'n8n-workflow'; import { ok } from 'node:assert/strict'; import path from 'path'; diff --git a/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts index 0c6553a4b3..d1b4744d72 100644 --- a/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts +++ b/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts @@ -1,4 +1,5 @@ import type { SourceControlledFile } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import type { Variables, Project, TagEntity, User, WorkflowTagMapping } from '@n8n/db'; import { SharedCredentials, @@ -17,7 +18,7 @@ import { Service } from '@n8n/di'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import import { In } from '@n8n/typeorm'; import glob from 'fast-glob'; -import { Credentials, ErrorReporter, InstanceSettings, Logger } from 'n8n-core'; +import { Credentials, ErrorReporter, InstanceSettings } from 'n8n-core'; import { jsonParse, ensureError, UserError, UnexpectedError } from 'n8n-workflow'; import { readFile as fsReadFile } from 'node:fs/promises'; import path from 'path'; diff --git a/packages/cli/src/environments.ee/source-control/source-control-preferences.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-preferences.service.ee.ts index d1cd320169..2caf0eb4b5 100644 --- a/packages/cli/src/environments.ee/source-control/source-control-preferences.service.ee.ts +++ b/packages/cli/src/environments.ee/source-control/source-control-preferences.service.ee.ts @@ -1,9 +1,10 @@ +import { Logger } from '@n8n/backend-common'; import { SettingsRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import type { ValidationError } from 'class-validator'; import { validate } from 'class-validator'; import { rm as fsRm } from 'fs/promises'; -import { Cipher, InstanceSettings, Logger } from 'n8n-core'; +import { Cipher, InstanceSettings } from 'n8n-core'; import { jsonParse, UnexpectedError } from 'n8n-workflow'; import { writeFile, chmod, readFile } from 'node:fs/promises'; import path from 'path'; diff --git a/packages/cli/src/environments.ee/source-control/source-control.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control.service.ee.ts index 01fe1f016a..ca1ba1d6bd 100644 --- a/packages/cli/src/environments.ee/source-control/source-control.service.ee.ts +++ b/packages/cli/src/environments.ee/source-control/source-control.service.ee.ts @@ -3,6 +3,7 @@ import type { PushWorkFolderRequestDto, SourceControlledFile, } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import { type Variables, type TagEntity, @@ -13,7 +14,6 @@ import { import { Service } from '@n8n/di'; import { hasGlobalScope } from '@n8n/permissions'; import { writeFileSync } from 'fs'; -import { Logger } from 'n8n-core'; import { UnexpectedError, UserError } from 'n8n-workflow'; import path from 'path'; import type { PushResult } from 'simple-git'; diff --git a/packages/cli/src/evaluation.ee/test-runner/test-run-cleanup.service.ee.ts b/packages/cli/src/evaluation.ee/test-runner/test-run-cleanup.service.ee.ts index aeed1ec4a8..45647c9292 100644 --- a/packages/cli/src/evaluation.ee/test-runner/test-run-cleanup.service.ee.ts +++ b/packages/cli/src/evaluation.ee/test-runner/test-run-cleanup.service.ee.ts @@ -1,6 +1,6 @@ +import { Logger } from '@n8n/backend-common'; import { TestRunRepository } from '@n8n/db'; import { Service } from '@n8n/di'; -import { Logger } from 'n8n-core'; /** * This service is responsible for cleaning up pending Test Runs on application startup. diff --git a/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts b/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts index 836911fd0e..f4132993ce 100644 --- a/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts +++ b/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts @@ -1,7 +1,8 @@ +import { Logger } from '@n8n/backend-common'; import type { User, TestRun } from '@n8n/db'; import { TestCaseExecutionRepository, TestRunRepository, WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; -import { ErrorReporter, Logger } from 'n8n-core'; +import { ErrorReporter } from 'n8n-core'; import { EVALUATION_NODE_TYPE, EVALUATION_TRIGGER_NODE_TYPE, diff --git a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-from-db.ts b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-from-db.ts index 226e122424..030bb9c948 100644 --- a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-from-db.ts +++ b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-from-db.ts @@ -1,6 +1,6 @@ +import { Logger } from '@n8n/backend-common'; import type { EventDestinations } from '@n8n/db'; import { Container } from '@n8n/di'; -import { Logger } from 'n8n-core'; import { MessageEventBusDestinationTypeNames } from 'n8n-workflow'; import { MessageEventBusDestinationSentry } from './message-event-bus-destination-sentry.ee'; diff --git a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-syslog.ee.ts b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-syslog.ee.ts index b1f0675dab..a624673cd0 100644 --- a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-syslog.ee.ts +++ b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-syslog.ee.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ +import { Logger } from '@n8n/backend-common'; import { Container } from '@n8n/di'; -import { Logger } from 'n8n-core'; import type { MessageEventBusDestinationOptions, MessageEventBusDestinationSyslogOptions, diff --git a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination.ee.ts b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination.ee.ts index 81d2cbdfda..93b461011d 100644 --- a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination.ee.ts +++ b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination.ee.ts @@ -1,6 +1,6 @@ +import { Logger } from '@n8n/backend-common'; import { EventDestinationsRepository } from '@n8n/db'; import { Container } from '@n8n/di'; -import { Logger } from 'n8n-core'; import type { INodeCredentials, MessageEventBusDestinationOptions } from 'n8n-workflow'; import { MessageEventBusDestinationTypeNames } from 'n8n-workflow'; import { v4 as uuid } from 'uuid'; diff --git a/packages/cli/src/eventbus/message-event-bus-writer/message-event-bus-log-writer.ts b/packages/cli/src/eventbus/message-event-bus-writer/message-event-bus-log-writer.ts index bfe0ee8bb3..27258385dd 100644 --- a/packages/cli/src/eventbus/message-event-bus-writer/message-event-bus-log-writer.ts +++ b/packages/cli/src/eventbus/message-event-bus-writer/message-event-bus-log-writer.ts @@ -1,12 +1,12 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ -import { inTest } from '@n8n/backend-common'; +import { inTest, Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { Container } from '@n8n/di'; import { once as eventOnce } from 'events'; import { createReadStream, existsSync, rmSync } from 'fs'; import remove from 'lodash/remove'; -import { InstanceSettings, Logger } from 'n8n-core'; +import { InstanceSettings } from 'n8n-core'; import { EventMessageTypeNames, jsonParse } from 'n8n-workflow'; import path, { parse } from 'path'; import readline from 'readline'; diff --git a/packages/cli/src/eventbus/message-event-bus/message-event-bus.ts b/packages/cli/src/eventbus/message-event-bus/message-event-bus.ts index 38ffb37bf6..bd6f2289f7 100644 --- a/packages/cli/src/eventbus/message-event-bus/message-event-bus.ts +++ b/packages/cli/src/eventbus/message-event-bus/message-event-bus.ts @@ -1,3 +1,4 @@ +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { EventDestinationsRepository, ExecutionRepository, WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; @@ -7,7 +8,6 @@ import type { DeleteResult } from '@n8n/typeorm'; import { In } from '@n8n/typeorm'; import EventEmitter from 'events'; import uniqby from 'lodash/uniqBy'; -import { Logger } from 'n8n-core'; import type { MessageEventBusDestinationOptions } from 'n8n-workflow'; import config from '@/config'; diff --git a/packages/cli/src/execution-lifecycle/__tests__/execution-lifecycle-hooks.test.ts b/packages/cli/src/execution-lifecycle/__tests__/execution-lifecycle-hooks.test.ts index 7231aec35d..86ef43cf3a 100644 --- a/packages/cli/src/execution-lifecycle/__tests__/execution-lifecycle-hooks.test.ts +++ b/packages/cli/src/execution-lifecycle/__tests__/execution-lifecycle-hooks.test.ts @@ -1,3 +1,4 @@ +import { Logger } from '@n8n/backend-common'; import type { Project } from '@n8n/db'; import { ExecutionRepository } from '@n8n/db'; import { stringify } from 'flatted'; @@ -6,7 +7,6 @@ import { BinaryDataService, ErrorReporter, InstanceSettings, - Logger, ExecutionLifecycleHooks, BinaryDataConfig, } from 'n8n-core'; diff --git a/packages/cli/src/execution-lifecycle/__tests__/save-execution-progress.test.ts b/packages/cli/src/execution-lifecycle/__tests__/save-execution-progress.test.ts index 999f41b919..105eb28cad 100644 --- a/packages/cli/src/execution-lifecycle/__tests__/save-execution-progress.test.ts +++ b/packages/cli/src/execution-lifecycle/__tests__/save-execution-progress.test.ts @@ -1,8 +1,8 @@ +import { Logger } from '@n8n/backend-common'; import type { IExecutionResponse } from '@n8n/db'; import { ExecutionRepository } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import { ErrorReporter } from 'n8n-core'; -import { Logger } from 'n8n-core'; import type { IRunExecutionData, ITaskData } from 'n8n-workflow'; import { mockInstance } from '@test/mocking'; diff --git a/packages/cli/src/execution-lifecycle/execute-error-workflow.ts b/packages/cli/src/execution-lifecycle/execute-error-workflow.ts index 3aeed34aa3..753bf3febc 100644 --- a/packages/cli/src/execution-lifecycle/execute-error-workflow.ts +++ b/packages/cli/src/execution-lifecycle/execute-error-workflow.ts @@ -1,6 +1,7 @@ +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { Container } from '@n8n/di'; -import { ErrorReporter, Logger } from 'n8n-core'; +import { ErrorReporter } from 'n8n-core'; import type { IRun, IWorkflowBase, WorkflowExecuteMode } from 'n8n-workflow'; import type { IWorkflowErrorData } from '@/interfaces'; diff --git a/packages/cli/src/execution-lifecycle/execution-lifecycle-hooks.ts b/packages/cli/src/execution-lifecycle/execution-lifecycle-hooks.ts index a19e4cb609..ea311f7da7 100644 --- a/packages/cli/src/execution-lifecycle/execution-lifecycle-hooks.ts +++ b/packages/cli/src/execution-lifecycle/execution-lifecycle-hooks.ts @@ -1,7 +1,8 @@ +import { Logger } from '@n8n/backend-common'; import { ExecutionRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { stringify } from 'flatted'; -import { ErrorReporter, Logger, InstanceSettings, ExecutionLifecycleHooks } from 'n8n-core'; +import { ErrorReporter, InstanceSettings, ExecutionLifecycleHooks } from 'n8n-core'; import type { IWorkflowBase, WorkflowExecuteMode, diff --git a/packages/cli/src/execution-lifecycle/restore-binary-data-id.ts b/packages/cli/src/execution-lifecycle/restore-binary-data-id.ts index 6cbc45d8a2..2eaa1ce696 100644 --- a/packages/cli/src/execution-lifecycle/restore-binary-data-id.ts +++ b/packages/cli/src/execution-lifecycle/restore-binary-data-id.ts @@ -1,6 +1,7 @@ +import { Logger } from '@n8n/backend-common'; import { Container } from '@n8n/di'; import type { BinaryData } from 'n8n-core'; -import { BinaryDataConfig, BinaryDataService, Logger } from 'n8n-core'; +import { BinaryDataConfig, BinaryDataService } from 'n8n-core'; import type { IRun, WorkflowExecuteMode } from 'n8n-workflow'; /** diff --git a/packages/cli/src/execution-lifecycle/save-execution-progress.ts b/packages/cli/src/execution-lifecycle/save-execution-progress.ts index c97645b0ab..5dd898e870 100644 --- a/packages/cli/src/execution-lifecycle/save-execution-progress.ts +++ b/packages/cli/src/execution-lifecycle/save-execution-progress.ts @@ -1,6 +1,7 @@ +import { Logger } from '@n8n/backend-common'; import { ExecutionRepository } from '@n8n/db'; import { Container } from '@n8n/di'; -import { ErrorReporter, Logger } from 'n8n-core'; +import { ErrorReporter } from 'n8n-core'; import type { IRunExecutionData, ITaskData } from 'n8n-workflow'; export async function saveExecutionProgress( diff --git a/packages/cli/src/execution-lifecycle/shared/shared-hook-functions.ts b/packages/cli/src/execution-lifecycle/shared/shared-hook-functions.ts index 85467893cc..c1a10d0123 100644 --- a/packages/cli/src/execution-lifecycle/shared/shared-hook-functions.ts +++ b/packages/cli/src/execution-lifecycle/shared/shared-hook-functions.ts @@ -1,8 +1,8 @@ +import { Logger } from '@n8n/backend-common'; import type { IExecutionDb } from '@n8n/db'; import { ExecutionRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import pick from 'lodash/pick'; -import { Logger } from 'n8n-core'; import { ensureError, type ExecutionStatus, type IRun, type IWorkflowBase } from 'n8n-workflow'; import type { UpdateExecutionPayload } from '@/interfaces'; diff --git a/packages/cli/src/executions/execution-recovery.service.ts b/packages/cli/src/executions/execution-recovery.service.ts index 701277a696..1064fafce9 100644 --- a/packages/cli/src/executions/execution-recovery.service.ts +++ b/packages/cli/src/executions/execution-recovery.service.ts @@ -1,8 +1,9 @@ +import { Logger } from '@n8n/backend-common'; import type { IExecutionResponse } from '@n8n/db'; import { ExecutionRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import type { DateTime } from 'luxon'; -import { InstanceSettings, Logger } from 'n8n-core'; +import { InstanceSettings } from 'n8n-core'; import { sleep } from 'n8n-workflow'; import type { IRun, ITaskData } from 'n8n-workflow'; diff --git a/packages/cli/src/executions/execution.service.ts b/packages/cli/src/executions/execution.service.ts index d8ced210ae..43cc1f62a4 100644 --- a/packages/cli/src/executions/execution.service.ts +++ b/packages/cli/src/executions/execution.service.ts @@ -1,3 +1,4 @@ +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import type { User, @@ -14,7 +15,6 @@ import { } from '@n8n/db'; import { Service } from '@n8n/di'; import { validate as jsonSchemaValidate } from 'jsonschema'; -import { Logger } from 'n8n-core'; import type { ExecutionError, ExecutionStatus, diff --git a/packages/cli/src/executions/pre-execution-checks/subworkflow-policy-checker.ts b/packages/cli/src/executions/pre-execution-checks/subworkflow-policy-checker.ts index 10ee72b1e1..3ad8d5d196 100644 --- a/packages/cli/src/executions/pre-execution-checks/subworkflow-policy-checker.ts +++ b/packages/cli/src/executions/pre-execution-checks/subworkflow-policy-checker.ts @@ -1,7 +1,7 @@ +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import type { Project } from '@n8n/db'; import { Service } from '@n8n/di'; -import { Logger } from 'n8n-core'; import { type Workflow, type INode, type WorkflowSettings } from 'n8n-workflow'; import { SubworkflowPolicyDenialError } from '@/errors/subworkflow-policy-denial.error'; diff --git a/packages/cli/src/external-hooks.ts b/packages/cli/src/external-hooks.ts index 7a93c950cd..c0feabac2d 100644 --- a/packages/cli/src/external-hooks.ts +++ b/packages/cli/src/external-hooks.ts @@ -1,4 +1,5 @@ import type { FrontendSettings, UserUpdateRequestDto } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import type { ClientOAuth2Options } from '@n8n/client-oauth2'; import { GlobalConfig } from '@n8n/config'; import type { TagEntity, User, ICredentialsDb, PublicUser } from '@n8n/db'; @@ -9,7 +10,7 @@ import { UserRepository, } from '@n8n/db'; import { Service } from '@n8n/di'; -import { ErrorReporter, Logger } from 'n8n-core'; +import { ErrorReporter } from 'n8n-core'; import type { IRun, IWorkflowBase, Workflow, WorkflowExecuteMode } from 'n8n-workflow'; import { UnexpectedError } from 'n8n-workflow'; import type clientOAuth1 from 'oauth-1.0a'; diff --git a/packages/cli/src/external-secrets.ee/external-secrets-manager.ee.ts b/packages/cli/src/external-secrets.ee/external-secrets-manager.ee.ts index 94c72cd443..49d03bf2f4 100644 --- a/packages/cli/src/external-secrets.ee/external-secrets-manager.ee.ts +++ b/packages/cli/src/external-secrets.ee/external-secrets-manager.ee.ts @@ -1,7 +1,8 @@ +import { Logger } from '@n8n/backend-common'; import { SettingsRepository } from '@n8n/db'; import { OnShutdown } from '@n8n/decorators'; import { Service } from '@n8n/di'; -import { Cipher, Logger } from 'n8n-core'; +import { Cipher } from 'n8n-core'; import { jsonParse, type IDataObject, ensureError, UnexpectedError } from 'n8n-workflow'; import { EventService } from '@/events/event.service'; diff --git a/packages/cli/src/external-secrets.ee/providers/aws-secrets-manager.ts b/packages/cli/src/external-secrets.ee/providers/aws-secrets-manager.ts index ba389900cf..ab0585e91a 100644 --- a/packages/cli/src/external-secrets.ee/providers/aws-secrets-manager.ts +++ b/packages/cli/src/external-secrets.ee/providers/aws-secrets-manager.ts @@ -1,6 +1,6 @@ import { SecretsManager, type SecretsManagerClientConfig } from '@aws-sdk/client-secrets-manager'; +import { Logger } from '@n8n/backend-common'; import { Container } from '@n8n/di'; -import { Logger } from 'n8n-core'; import type { INodeProperties } from 'n8n-workflow'; import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '../constants'; diff --git a/packages/cli/src/external-secrets.ee/providers/azure-key-vault/azure-key-vault.ts b/packages/cli/src/external-secrets.ee/providers/azure-key-vault/azure-key-vault.ts index 2aa7793a1f..5d508d558a 100644 --- a/packages/cli/src/external-secrets.ee/providers/azure-key-vault/azure-key-vault.ts +++ b/packages/cli/src/external-secrets.ee/providers/azure-key-vault/azure-key-vault.ts @@ -1,6 +1,6 @@ import type { SecretClient } from '@azure/keyvault-secrets'; +import { Logger } from '@n8n/backend-common'; import { Container } from '@n8n/di'; -import { Logger } from 'n8n-core'; import { ensureError } from 'n8n-workflow'; import type { INodeProperties } from 'n8n-workflow'; diff --git a/packages/cli/src/external-secrets.ee/providers/gcp-secrets-manager/gcp-secrets-manager.ts b/packages/cli/src/external-secrets.ee/providers/gcp-secrets-manager/gcp-secrets-manager.ts index eb90263a31..afd9b0d7bd 100644 --- a/packages/cli/src/external-secrets.ee/providers/gcp-secrets-manager/gcp-secrets-manager.ts +++ b/packages/cli/src/external-secrets.ee/providers/gcp-secrets-manager/gcp-secrets-manager.ts @@ -1,6 +1,6 @@ import type { SecretManagerServiceClient as GcpClient } from '@google-cloud/secret-manager'; +import { Logger } from '@n8n/backend-common'; import { Container } from '@n8n/di'; -import { Logger } from 'n8n-core'; import { ensureError, jsonParse, type INodeProperties } from 'n8n-workflow'; import type { diff --git a/packages/cli/src/external-secrets.ee/providers/vault.ts b/packages/cli/src/external-secrets.ee/providers/vault.ts index 383820b50b..f068dfed1b 100644 --- a/packages/cli/src/external-secrets.ee/providers/vault.ts +++ b/packages/cli/src/external-secrets.ee/providers/vault.ts @@ -1,7 +1,7 @@ +import { Logger } from '@n8n/backend-common'; import { Container } from '@n8n/di'; import type { AxiosInstance, AxiosResponse } from 'axios'; import axios from 'axios'; -import { Logger } from 'n8n-core'; import type { IDataObject, INodeProperties } from 'n8n-workflow'; import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '../constants'; diff --git a/packages/cli/src/help.ts b/packages/cli/src/help.ts index 9213048fdd..67abc8ecde 100644 --- a/packages/cli/src/help.ts +++ b/packages/cli/src/help.ts @@ -1,6 +1,6 @@ +import { Logger } from '@n8n/backend-common'; import { Container } from '@n8n/di'; import { Help } from '@oclif/core'; -import { Logger } from 'n8n-core'; // oclif expects a default export // eslint-disable-next-line import/no-default-export diff --git a/packages/cli/src/ldap.ee/ldap.service.ee.ts b/packages/cli/src/ldap.ee/ldap.service.ee.ts index 8754f7592f..0f94b6b5e6 100644 --- a/packages/cli/src/ldap.ee/ldap.service.ee.ts +++ b/packages/cli/src/ldap.ee/ldap.service.ee.ts @@ -1,3 +1,4 @@ +import { Logger } from '@n8n/backend-common'; import type { LdapConfig } from '@n8n/constants'; import { LDAP_FEATURE_NAME } from '@n8n/constants'; import { SettingsRepository } from '@n8n/db'; @@ -7,7 +8,7 @@ import { Service } from '@n8n/di'; import { QueryFailedError } from '@n8n/typeorm'; import type { Entry as LdapUser, ClientOptions } from 'ldapts'; import { Client } from 'ldapts'; -import { Cipher, Logger } from 'n8n-core'; +import { Cipher } from 'n8n-core'; import { jsonParse, UnexpectedError } from 'n8n-workflow'; import type { ConnectionOptions } from 'tls'; diff --git a/packages/cli/src/license.ts b/packages/cli/src/license.ts index 087ed626e3..b9983cf24b 100644 --- a/packages/cli/src/license.ts +++ b/packages/cli/src/license.ts @@ -1,4 +1,5 @@ import type { LicenseProvider } from '@n8n/backend-common'; +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { LICENSE_FEATURES, @@ -12,7 +13,7 @@ import { OnLeaderStepdown, OnLeaderTakeover, OnShutdown } from '@n8n/decorators' import { Container, Service } from '@n8n/di'; import type { TEntitlement, TLicenseBlock } from '@n8n_io/license-sdk'; import { LicenseManager } from '@n8n_io/license-sdk'; -import { InstanceSettings, Logger } from 'n8n-core'; +import { InstanceSettings } from 'n8n-core'; import config from '@/config'; import { LicenseMetricsService } from '@/metrics/license-metrics.service'; diff --git a/packages/cli/src/license/license.service.ts b/packages/cli/src/license/license.service.ts index 80526f8260..97bc9a3bdc 100644 --- a/packages/cli/src/license/license.service.ts +++ b/packages/cli/src/license/license.service.ts @@ -1,9 +1,8 @@ -import { LicenseState } from '@n8n/backend-common'; +import { LicenseState, Logger } from '@n8n/backend-common'; import type { User } from '@n8n/db'; import { WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import axios, { AxiosError } from 'axios'; -import { Logger } from 'n8n-core'; import { ensureError } from 'n8n-workflow'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; diff --git a/packages/cli/src/load-nodes-and-credentials.ts b/packages/cli/src/load-nodes-and-credentials.ts index 2d233dcc13..244d9af04b 100644 --- a/packages/cli/src/load-nodes-and-credentials.ts +++ b/packages/cli/src/load-nodes-and-credentials.ts @@ -1,4 +1,4 @@ -import { inTest } from '@n8n/backend-common'; +import { inTest, Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { Container, Service } from '@n8n/di'; import glob from 'fast-glob'; @@ -13,7 +13,6 @@ import { LazyPackageDirectoryLoader, UnrecognizedCredentialTypeError, UnrecognizedNodeTypeError, - Logger, } from 'n8n-core'; import type { KnownNodesAndCredentials, diff --git a/packages/cli/src/manual-execution.service.ts b/packages/cli/src/manual-execution.service.ts index 859a0892d7..7a3df1ce17 100644 --- a/packages/cli/src/manual-execution.service.ts +++ b/packages/cli/src/manual-execution.service.ts @@ -1,3 +1,4 @@ +import { Logger } from '@n8n/backend-common'; import { Service } from '@n8n/di'; import * as a from 'assert/strict'; import { @@ -5,7 +6,6 @@ import { filterDisabledNodes, recreateNodeExecutionStack, WorkflowExecute, - Logger, isTool, rewireGraph, } from 'n8n-core'; diff --git a/packages/cli/src/modules/insights/__tests__/insights.module.test.ts b/packages/cli/src/modules/insights/__tests__/insights.module.test.ts index 469e9eab30..391efed24f 100644 --- a/packages/cli/src/modules/insights/__tests__/insights.module.test.ts +++ b/packages/cli/src/modules/insights/__tests__/insights.module.test.ts @@ -1,5 +1,5 @@ +import type { Logger } from '@n8n/backend-common'; import { InstanceSettings } from 'n8n-core'; -import type { Logger } from 'n8n-core'; import { mockInstance, mockLogger } from '@test/mocking'; diff --git a/packages/cli/src/modules/insights/insights-collection.service.ts b/packages/cli/src/modules/insights/insights-collection.service.ts index 409b575fcd..0f7deeb2ac 100644 --- a/packages/cli/src/modules/insights/insights-collection.service.ts +++ b/packages/cli/src/modules/insights/insights-collection.service.ts @@ -1,9 +1,9 @@ +import { Logger } from '@n8n/backend-common'; import { SharedWorkflowRepository } from '@n8n/db'; import { OnLifecycleEvent, type WorkflowExecuteAfterContext } from '@n8n/decorators'; import { Service } from '@n8n/di'; import { In } from '@n8n/typeorm'; import { DateTime } from 'luxon'; -import { Logger } from 'n8n-core'; import { UnexpectedError, type ExecutionStatus, type WorkflowExecuteMode } from 'n8n-workflow'; import { InsightsMetadata } from '@/modules/insights/database/entities/insights-metadata'; diff --git a/packages/cli/src/modules/insights/insights-compaction.service.ts b/packages/cli/src/modules/insights/insights-compaction.service.ts index 4061849deb..b641d1f91c 100644 --- a/packages/cli/src/modules/insights/insights-compaction.service.ts +++ b/packages/cli/src/modules/insights/insights-compaction.service.ts @@ -1,5 +1,5 @@ +import { Logger } from '@n8n/backend-common'; import { Service } from '@n8n/di'; -import { Logger } from 'n8n-core'; import { InsightsByPeriodRepository } from './database/repositories/insights-by-period.repository'; import { InsightsRawRepository } from './database/repositories/insights-raw.repository'; diff --git a/packages/cli/src/modules/insights/insights-pruning.service.ts b/packages/cli/src/modules/insights/insights-pruning.service.ts index 5305e744e6..c423592947 100644 --- a/packages/cli/src/modules/insights/insights-pruning.service.ts +++ b/packages/cli/src/modules/insights/insights-pruning.service.ts @@ -1,7 +1,6 @@ -import { LicenseState } from '@n8n/backend-common'; +import { LicenseState, Logger } from '@n8n/backend-common'; import { Service } from '@n8n/di'; import { strict } from 'assert'; -import { Logger } from 'n8n-core'; import { Time } from '@/constants'; diff --git a/packages/cli/src/modules/insights/insights.module.ts b/packages/cli/src/modules/insights/insights.module.ts index 091414e9ad..eb4558caa7 100644 --- a/packages/cli/src/modules/insights/insights.module.ts +++ b/packages/cli/src/modules/insights/insights.module.ts @@ -1,6 +1,7 @@ +import { Logger } from '@n8n/backend-common'; import type { BaseN8nModule } from '@n8n/decorators'; import { N8nModule, OnLeaderStepdown, OnLeaderTakeover } from '@n8n/decorators'; -import { InstanceSettings, Logger } from 'n8n-core'; +import { InstanceSettings } from 'n8n-core'; import { InsightsService } from './insights.service'; diff --git a/packages/cli/src/modules/insights/insights.service.ts b/packages/cli/src/modules/insights/insights.service.ts index 92ea76f1d4..a883cc24a6 100644 --- a/packages/cli/src/modules/insights/insights.service.ts +++ b/packages/cli/src/modules/insights/insights.service.ts @@ -3,10 +3,9 @@ import { type InsightsDateRange, INSIGHTS_DATE_RANGE_KEYS, } from '@n8n/api-types'; -import { LicenseState } from '@n8n/backend-common'; +import { LicenseState, Logger } from '@n8n/backend-common'; import { OnShutdown } from '@n8n/decorators'; import { Service } from '@n8n/di'; -import { Logger } from 'n8n-core'; import { UserError } from 'n8n-workflow'; import type { PeriodUnit, TypeUnit } from './database/entities/insights-shared'; diff --git a/packages/cli/src/push/__tests__/index.test.ts b/packages/cli/src/push/__tests__/index.test.ts index 16e321f694..8c35ad9df0 100644 --- a/packages/cli/src/push/__tests__/index.test.ts +++ b/packages/cli/src/push/__tests__/index.test.ts @@ -1,7 +1,7 @@ +import type { Logger } from '@n8n/backend-common'; import type { User } from '@n8n/db'; import type { Application } from 'express'; import { captor, mock } from 'jest-mock-extended'; -import type { Logger } from 'n8n-core'; import type { Server, ServerResponse } from 'node:http'; import type { Socket } from 'node:net'; import { type WebSocket, Server as WSServer } from 'ws'; diff --git a/packages/cli/src/push/__tests__/websocket.push.test.ts b/packages/cli/src/push/__tests__/websocket.push.test.ts index 55c52f86cf..41f22a6eeb 100644 --- a/packages/cli/src/push/__tests__/websocket.push.test.ts +++ b/packages/cli/src/push/__tests__/websocket.push.test.ts @@ -1,8 +1,8 @@ import { createHeartbeatMessage, type PushMessage } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import type { User } from '@n8n/db'; import { Container } from '@n8n/di'; import { EventEmitter } from 'events'; -import { Logger } from 'n8n-core'; import type WebSocket from 'ws'; import { WebSocketPush } from '@/push/websocket.push'; diff --git a/packages/cli/src/push/abstract.push.ts b/packages/cli/src/push/abstract.push.ts index 77c069dcd3..a029925c27 100644 --- a/packages/cli/src/push/abstract.push.ts +++ b/packages/cli/src/push/abstract.push.ts @@ -1,7 +1,8 @@ import type { PushMessage } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import type { User } from '@n8n/db'; import { Service } from '@n8n/di'; -import { ErrorReporter, Logger } from 'n8n-core'; +import { ErrorReporter } from 'n8n-core'; import { assert, jsonStringify } from 'n8n-workflow'; import type { OnPushMessage } from '@/push/types'; diff --git a/packages/cli/src/push/index.ts b/packages/cli/src/push/index.ts index 2107cb4609..4784d77a3f 100644 --- a/packages/cli/src/push/index.ts +++ b/packages/cli/src/push/index.ts @@ -1,5 +1,5 @@ import type { PushMessage } from '@n8n/api-types'; -import { inProduction } from '@n8n/backend-common'; +import { inProduction, Logger } from '@n8n/backend-common'; import type { User } from '@n8n/db'; import { OnShutdown } from '@n8n/decorators'; import { Container, Service } from '@n8n/di'; @@ -7,7 +7,7 @@ import type { Application } from 'express'; import { ServerResponse } from 'http'; import type { Server } from 'http'; import { pick } from 'lodash'; -import { InstanceSettings, Logger } from 'n8n-core'; +import { InstanceSettings } from 'n8n-core'; import { deepCopy } from 'n8n-workflow'; import { parse as parseUrl } from 'url'; import { Server as WSServer } from 'ws'; diff --git a/packages/cli/src/response-helper.ts b/packages/cli/src/response-helper.ts index 61747eb778..d367cac2e7 100644 --- a/packages/cli/src/response-helper.ts +++ b/packages/cli/src/response-helper.ts @@ -1,8 +1,8 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ -import { inDevelopment } from '@n8n/backend-common'; +import { inDevelopment, Logger } from '@n8n/backend-common'; import { Container } from '@n8n/di'; import type { Request, Response } from 'express'; -import { ErrorReporter, Logger } from 'n8n-core'; +import { ErrorReporter } from 'n8n-core'; import { FORM_TRIGGER_PATH_IDENTIFIER, NodeApiError } from 'n8n-workflow'; import { Readable } from 'node:stream'; import picocolors from 'picocolors'; diff --git a/packages/cli/src/scaling/__tests__/job-processor.service.test.ts b/packages/cli/src/scaling/__tests__/job-processor.service.test.ts index 99d515da55..6648c4dab2 100644 --- a/packages/cli/src/scaling/__tests__/job-processor.service.test.ts +++ b/packages/cli/src/scaling/__tests__/job-processor.service.test.ts @@ -1,8 +1,8 @@ +import type { Logger } from '@n8n/backend-common'; import type { IExecutionResponse } from '@n8n/db'; import type { ExecutionRepository } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import type { WorkflowExecute as ActualWorkflowExecute } from 'n8n-core'; -import { type Logger } from 'n8n-core'; import { mockInstance } from 'n8n-core/test/utils'; import type { IPinData, ITaskData, IWorkflowExecuteAdditionalData } from 'n8n-workflow'; import { Workflow, type IRunExecutionData, type WorkflowExecuteMode } from 'n8n-workflow'; diff --git a/packages/cli/src/scaling/job-processor.ts b/packages/cli/src/scaling/job-processor.ts index d6339ea467..a2b3d069f8 100644 --- a/packages/cli/src/scaling/job-processor.ts +++ b/packages/cli/src/scaling/job-processor.ts @@ -1,7 +1,8 @@ import type { RunningJobSummary } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import { ExecutionRepository, WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; -import { WorkflowHasIssuesError, InstanceSettings, WorkflowExecute, Logger } from 'n8n-core'; +import { WorkflowHasIssuesError, InstanceSettings, WorkflowExecute } from 'n8n-core'; import type { ExecutionStatus, IExecuteResponsePromiseData, diff --git a/packages/cli/src/scaling/multi-main-setup.ee.ts b/packages/cli/src/scaling/multi-main-setup.ee.ts index 334c82d79e..267fcf033c 100644 --- a/packages/cli/src/scaling/multi-main-setup.ee.ts +++ b/packages/cli/src/scaling/multi-main-setup.ee.ts @@ -1,7 +1,8 @@ +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { MultiMainMetadata } from '@n8n/decorators'; import { Container, Service } from '@n8n/di'; -import { InstanceSettings, Logger } from 'n8n-core'; +import { InstanceSettings } from 'n8n-core'; import config from '@/config'; import { Time } from '@/constants'; diff --git a/packages/cli/src/scaling/pubsub/publisher.service.ts b/packages/cli/src/scaling/pubsub/publisher.service.ts index d70060edfc..90ace1f6d6 100644 --- a/packages/cli/src/scaling/pubsub/publisher.service.ts +++ b/packages/cli/src/scaling/pubsub/publisher.service.ts @@ -1,6 +1,7 @@ +import { Logger } from '@n8n/backend-common'; import { Service } from '@n8n/di'; import type { Redis as SingleNodeClient, Cluster as MultiNodeClient } from 'ioredis'; -import { InstanceSettings, Logger } from 'n8n-core'; +import { InstanceSettings } from 'n8n-core'; import type { LogMetadata } from 'n8n-workflow'; import config from '@/config'; diff --git a/packages/cli/src/scaling/pubsub/subscriber.service.ts b/packages/cli/src/scaling/pubsub/subscriber.service.ts index 4d2b5e3314..9c6215a761 100644 --- a/packages/cli/src/scaling/pubsub/subscriber.service.ts +++ b/packages/cli/src/scaling/pubsub/subscriber.service.ts @@ -1,7 +1,8 @@ +import { Logger } from '@n8n/backend-common'; import { Service } from '@n8n/di'; import type { Redis as SingleNodeClient, Cluster as MultiNodeClient } from 'ioredis'; import debounce from 'lodash/debounce'; -import { InstanceSettings, Logger } from 'n8n-core'; +import { InstanceSettings } from 'n8n-core'; import { jsonParse } from 'n8n-workflow'; import type { LogMetadata } from 'n8n-workflow'; diff --git a/packages/cli/src/scaling/scaling.service.ts b/packages/cli/src/scaling/scaling.service.ts index 74812751fa..6d09ad05fd 100644 --- a/packages/cli/src/scaling/scaling.service.ts +++ b/packages/cli/src/scaling/scaling.service.ts @@ -1,9 +1,9 @@ -import { isObjectLiteral } from '@n8n/backend-common'; +import { isObjectLiteral, Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { ExecutionRepository } from '@n8n/db'; import { OnLeaderStepdown, OnLeaderTakeover, OnShutdown } from '@n8n/decorators'; import { Container, Service } from '@n8n/di'; -import { ErrorReporter, InstanceSettings, Logger } from 'n8n-core'; +import { ErrorReporter, InstanceSettings } from 'n8n-core'; import { BINARY_ENCODING, sleep, diff --git a/packages/cli/src/scaling/worker-server.ts b/packages/cli/src/scaling/worker-server.ts index cdf6b213fd..19416efa62 100644 --- a/packages/cli/src/scaling/worker-server.ts +++ b/packages/cli/src/scaling/worker-server.ts @@ -1,8 +1,9 @@ +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { Service } from '@n8n/di'; import type { Application } from 'express'; import express from 'express'; -import { InstanceSettings, Logger } from 'n8n-core'; +import { InstanceSettings } from 'n8n-core'; import { strict as assert } from 'node:assert'; import http from 'node:http'; import type { Server } from 'node:http'; diff --git a/packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts b/packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts index 7fe2fa7906..beeb5e35bf 100644 --- a/packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts +++ b/packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts @@ -1,9 +1,9 @@ -import { inDevelopment } from '@n8n/backend-common'; +import { inDevelopment, Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { separate } from '@n8n/db'; import { Service } from '@n8n/di'; import axios from 'axios'; -import { InstanceSettings, Logger } from 'n8n-core'; +import { InstanceSettings } from 'n8n-core'; import type { IWorkflowBase } from 'n8n-workflow'; import config from '@/config'; diff --git a/packages/cli/src/services/__tests__/community-packages.service.test.ts b/packages/cli/src/services/__tests__/community-packages.service.test.ts index 0ed51c4506..c14788a220 100644 --- a/packages/cli/src/services/__tests__/community-packages.service.test.ts +++ b/packages/cli/src/services/__tests__/community-packages.service.test.ts @@ -1,3 +1,4 @@ +import type { Logger } from '@n8n/backend-common'; import type { GlobalConfig } from '@n8n/config'; import { LICENSE_FEATURES } from '@n8n/constants'; import { InstalledNodes } from '@n8n/db'; @@ -9,7 +10,7 @@ import { exec } from 'child_process'; import { mkdir, readFile, writeFile, rm, access, constants } from 'fs/promises'; import { mocked } from 'jest-mock'; import { mock } from 'jest-mock-extended'; -import type { Logger, InstanceSettings, PackageDirectoryLoader } from 'n8n-core'; +import type { InstanceSettings, PackageDirectoryLoader } from 'n8n-core'; import type { PublicInstalledPackage } from 'n8n-workflow'; import { join } from 'node:path'; diff --git a/packages/cli/src/services/active-workflows.service.ts b/packages/cli/src/services/active-workflows.service.ts index 944e151b90..16b97f666e 100644 --- a/packages/cli/src/services/active-workflows.service.ts +++ b/packages/cli/src/services/active-workflows.service.ts @@ -1,8 +1,8 @@ +import { Logger } from '@n8n/backend-common'; import type { User } from '@n8n/db'; import { SharedWorkflowRepository, WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import { hasGlobalScope } from '@n8n/permissions'; -import { Logger } from 'n8n-core'; import { ActivationErrorsService } from '@/activation-errors.service'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; diff --git a/packages/cli/src/services/community-node-types.service.ts b/packages/cli/src/services/community-node-types.service.ts index 3fa47ee86f..576871c5c9 100644 --- a/packages/cli/src/services/community-node-types.service.ts +++ b/packages/cli/src/services/community-node-types.service.ts @@ -1,7 +1,7 @@ import type { CommunityNodeType } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { Service } from '@n8n/di'; -import { Logger } from 'n8n-core'; import { ensureError, type INodeTypeDescription } from 'n8n-workflow'; import { CommunityPackagesService } from './community-packages.service'; diff --git a/packages/cli/src/services/community-packages.service.ts b/packages/cli/src/services/community-packages.service.ts index 86cb2d3387..2c0d1cd0a7 100644 --- a/packages/cli/src/services/community-packages.service.ts +++ b/packages/cli/src/services/community-packages.service.ts @@ -1,3 +1,4 @@ +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { LICENSE_FEATURES } from '@n8n/constants'; import type { InstalledPackages } from '@n8n/db'; @@ -7,7 +8,7 @@ import axios from 'axios'; import { exec } from 'child_process'; import { access, constants, mkdir, readFile, rm, writeFile } from 'fs/promises'; import type { PackageDirectoryLoader } from 'n8n-core'; -import { InstanceSettings, Logger } from 'n8n-core'; +import { InstanceSettings } from 'n8n-core'; import { jsonParse, UnexpectedError, UserError, type PublicInstalledPackage } from 'n8n-workflow'; import { join } from 'path'; import { promisify } from 'util'; diff --git a/packages/cli/src/services/credentials-tester.service.ts b/packages/cli/src/services/credentials-tester.service.ts index 122e3efacd..3a84f15295 100644 --- a/packages/cli/src/services/credentials-tester.service.ts +++ b/packages/cli/src/services/credentials-tester.service.ts @@ -3,17 +3,11 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/no-unsafe-call */ -import { isObjectLiteral } from '@n8n/backend-common'; +import { Logger, isObjectLiteral } from '@n8n/backend-common'; import type { User } from '@n8n/db'; import { Service } from '@n8n/di'; import get from 'lodash/get'; -import { - CredentialTestContext, - ErrorReporter, - ExecuteContext, - Logger, - RoutingNode, -} from 'n8n-core'; +import { CredentialTestContext, ErrorReporter, ExecuteContext, RoutingNode } from 'n8n-core'; import type { ICredentialsDecrypted, ICredentialTestFunction, diff --git a/packages/cli/src/services/frontend.service.ts b/packages/cli/src/services/frontend.service.ts index 6e58787727..118203c4e9 100644 --- a/packages/cli/src/services/frontend.service.ts +++ b/packages/cli/src/services/frontend.service.ts @@ -1,12 +1,12 @@ import type { FrontendSettings, ITelemetrySettings } from '@n8n/api-types'; -import { LicenseState } from '@n8n/backend-common'; +import { LicenseState, Logger } from '@n8n/backend-common'; import { GlobalConfig, SecurityConfig } from '@n8n/config'; import { LICENSE_FEATURES } from '@n8n/constants'; import { Container, Service } from '@n8n/di'; import { createWriteStream } from 'fs'; import { mkdir } from 'fs/promises'; import uniq from 'lodash/uniq'; -import { BinaryDataConfig, InstanceSettings, Logger } from 'n8n-core'; +import { BinaryDataConfig, InstanceSettings } from 'n8n-core'; import type { ICredentialType, INodeTypeBaseDescription } from 'n8n-workflow'; import path from 'path'; diff --git a/packages/cli/src/services/import.service.ts b/packages/cli/src/services/import.service.ts index 52adc425a5..79e750e206 100644 --- a/packages/cli/src/services/import.service.ts +++ b/packages/cli/src/services/import.service.ts @@ -1,3 +1,4 @@ +import { Logger } from '@n8n/backend-common'; import type { TagEntity, ICredentialsDb, IWorkflowDb } from '@n8n/db'; import { Project, @@ -8,7 +9,6 @@ import { TagRepository, } from '@n8n/db'; import { Service } from '@n8n/di'; -import { Logger } from 'n8n-core'; import { type INode, type INodeCredentialsDetails, type IWorkflowBase } from 'n8n-workflow'; import { v4 as uuid } from 'uuid'; diff --git a/packages/cli/src/services/pruning/executions-pruning.service.ts b/packages/cli/src/services/pruning/executions-pruning.service.ts index ea7301ae03..d6b4d8e0f3 100644 --- a/packages/cli/src/services/pruning/executions-pruning.service.ts +++ b/packages/cli/src/services/pruning/executions-pruning.service.ts @@ -1,8 +1,9 @@ +import { Logger } from '@n8n/backend-common'; import { ExecutionsConfig } from '@n8n/config'; import { ExecutionRepository } from '@n8n/db'; import { OnLeaderStepdown, OnLeaderTakeover, OnShutdown } from '@n8n/decorators'; import { Service } from '@n8n/di'; -import { BinaryDataService, InstanceSettings, Logger } from 'n8n-core'; +import { BinaryDataService, InstanceSettings } from 'n8n-core'; import { ensureError } from 'n8n-workflow'; import { strict } from 'node:assert'; diff --git a/packages/cli/src/services/redis-client.service.ts b/packages/cli/src/services/redis-client.service.ts index f97ab70317..e0d7b37623 100644 --- a/packages/cli/src/services/redis-client.service.ts +++ b/packages/cli/src/services/redis-client.service.ts @@ -1,9 +1,9 @@ +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { Debounce } from '@n8n/decorators'; import { Service } from '@n8n/di'; import ioRedis from 'ioredis'; import type { Cluster, RedisOptions } from 'ioredis'; -import { Logger } from 'n8n-core'; import { TypedEmitter } from '@/typed-emitter'; diff --git a/packages/cli/src/services/user.service.ts b/packages/cli/src/services/user.service.ts index 3a5cec5ddf..b23d12dfd8 100644 --- a/packages/cli/src/services/user.service.ts +++ b/packages/cli/src/services/user.service.ts @@ -1,9 +1,9 @@ import type { RoleChangeRequestDto } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import type { PublicUser } from '@n8n/db'; import { User, UserRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import { getGlobalScopes, type AssignableGlobalRole } from '@n8n/permissions'; -import { Logger } from 'n8n-core'; import type { IUserSettings } from 'n8n-workflow'; import { UnexpectedError } from 'n8n-workflow'; diff --git a/packages/cli/src/services/workflow-statistics.service.ts b/packages/cli/src/services/workflow-statistics.service.ts index 21e542ce18..0b381c9ea9 100644 --- a/packages/cli/src/services/workflow-statistics.service.ts +++ b/packages/cli/src/services/workflow-statistics.service.ts @@ -1,6 +1,6 @@ +import { Logger } from '@n8n/backend-common'; import { StatisticsNames, WorkflowStatisticsRepository } from '@n8n/db'; import { Service } from '@n8n/di'; -import { Logger } from 'n8n-core'; import type { ExecutionStatus, INode, diff --git a/packages/cli/src/shutdown/shutdown.service.ts b/packages/cli/src/shutdown/shutdown.service.ts index 35c738dcfb..d819c9e785 100644 --- a/packages/cli/src/shutdown/shutdown.service.ts +++ b/packages/cli/src/shutdown/shutdown.service.ts @@ -1,7 +1,8 @@ +import { Logger } from '@n8n/backend-common'; import type { ShutdownHandler } from '@n8n/decorators'; import { ShutdownRegistryMetadata } from '@n8n/decorators'; import { Container, Service } from '@n8n/di'; -import { ErrorReporter, Logger } from 'n8n-core'; +import { ErrorReporter } from 'n8n-core'; import { assert, UnexpectedError, UserError } from 'n8n-workflow'; /** Error reported when a listener fails to shutdown gracefully */ diff --git a/packages/cli/src/sso.ee/saml/saml-validator.ts b/packages/cli/src/sso.ee/saml/saml-validator.ts index a34209ed50..5b677ecf6b 100644 --- a/packages/cli/src/sso.ee/saml/saml-validator.ts +++ b/packages/cli/src/sso.ee/saml/saml-validator.ts @@ -1,5 +1,5 @@ +import { Logger } from '@n8n/backend-common'; import { Service } from '@n8n/di'; -import { Logger } from 'n8n-core'; import { Constants, IdentityProvider } from 'samlify'; import type { IdentityProviderInstance } from 'samlify'; import type { XMLFileInfo, XMLLintOptions, XMLValidationResult } from 'xmllint-wasm'; diff --git a/packages/cli/src/sso.ee/saml/saml.service.ee.ts b/packages/cli/src/sso.ee/saml/saml.service.ee.ts index 161981ae35..1f88646527 100644 --- a/packages/cli/src/sso.ee/saml/saml.service.ee.ts +++ b/packages/cli/src/sso.ee/saml/saml.service.ee.ts @@ -1,11 +1,11 @@ import type { SamlPreferences } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import type { Settings, User } from '@n8n/db'; import { SettingsRepository, UserRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import axios from 'axios'; import type express from 'express'; import https from 'https'; -import { Logger } from 'n8n-core'; import { jsonParse, UnexpectedError } from 'n8n-workflow'; import { type IdentityProviderInstance, type ServiceProviderInstance } from 'samlify'; import type { BindingContext, PostBindingContext } from 'samlify/types/src/entity'; diff --git a/packages/cli/src/task-runners/__tests__/task-runner-process-restart-loop-detector.test.ts b/packages/cli/src/task-runners/__tests__/task-runner-process-restart-loop-detector.test.ts index 808cc1cb93..6b4b906f36 100644 --- a/packages/cli/src/task-runners/__tests__/task-runner-process-restart-loop-detector.test.ts +++ b/packages/cli/src/task-runners/__tests__/task-runner-process-restart-loop-detector.test.ts @@ -1,6 +1,6 @@ +import type { Logger } from '@n8n/backend-common'; import { TaskRunnersConfig } from '@n8n/config'; import { mock } from 'jest-mock-extended'; -import type { Logger } from 'n8n-core'; import { TaskRunnerRestartLoopError } from '@/task-runners/errors/task-runner-restart-loop-error'; import type { TaskBrokerAuthService } from '@/task-runners/task-broker/auth/task-broker-auth.service'; diff --git a/packages/cli/src/task-runners/__tests__/task-runner-process.test.ts b/packages/cli/src/task-runners/__tests__/task-runner-process.test.ts index de0e63d143..e4241eaf90 100644 --- a/packages/cli/src/task-runners/__tests__/task-runner-process.test.ts +++ b/packages/cli/src/task-runners/__tests__/task-runner-process.test.ts @@ -1,6 +1,6 @@ +import { Logger } from '@n8n/backend-common'; import { TaskRunnersConfig } from '@n8n/config'; import { mock } from 'jest-mock-extended'; -import { Logger } from 'n8n-core'; import type { ChildProcess, SpawnOptions } from 'node:child_process'; import type { TaskBrokerAuthService } from '@/task-runners/task-broker/auth/task-broker-auth.service'; diff --git a/packages/cli/src/task-runners/task-broker/__tests__/task-broker.service.test.ts b/packages/cli/src/task-runners/task-broker/__tests__/task-broker.service.test.ts index bfe3a474cf..b6784826df 100644 --- a/packages/cli/src/task-runners/task-broker/__tests__/task-broker.service.test.ts +++ b/packages/cli/src/task-runners/task-broker/__tests__/task-broker.service.test.ts @@ -1,7 +1,7 @@ +import type { Logger } from '@n8n/backend-common'; import type { TaskRunnersConfig } from '@n8n/config'; import type { RunnerMessage, TaskResultData } from '@n8n/task-runner'; import { mock } from 'jest-mock-extended'; -import type { Logger } from 'n8n-core'; import { ApplicationError, type INodeTypeBaseDescription } from 'n8n-workflow'; import { Time } from '@/constants'; diff --git a/packages/cli/src/task-runners/task-broker/task-broker-server.ts b/packages/cli/src/task-runners/task-broker/task-broker-server.ts index 1d8f98f7c1..be93beb55a 100644 --- a/packages/cli/src/task-runners/task-broker/task-broker-server.ts +++ b/packages/cli/src/task-runners/task-broker/task-broker-server.ts @@ -1,10 +1,9 @@ -import { inTest } from '@n8n/backend-common'; +import { inTest, Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { Service } from '@n8n/di'; import compression from 'compression'; import express from 'express'; import { rateLimit as expressRateLimit } from 'express-rate-limit'; -import { Logger } from 'n8n-core'; import * as a from 'node:assert/strict'; import { randomBytes } from 'node:crypto'; import { ServerResponse, type Server, createServer as createHttpServer } from 'node:http'; diff --git a/packages/cli/src/task-runners/task-broker/task-broker-ws-server.ts b/packages/cli/src/task-runners/task-broker/task-broker-ws-server.ts index 6a5e1ab429..e43cbb06d8 100644 --- a/packages/cli/src/task-runners/task-broker/task-broker-ws-server.ts +++ b/packages/cli/src/task-runners/task-broker/task-broker-ws-server.ts @@ -1,7 +1,7 @@ +import { Logger } from '@n8n/backend-common'; import { TaskRunnersConfig } from '@n8n/config'; import { Service } from '@n8n/di'; import type { BrokerMessage, RunnerMessage } from '@n8n/task-runner'; -import { Logger } from 'n8n-core'; import { jsonStringify, UserError } from 'n8n-workflow'; import type WebSocket from 'ws'; diff --git a/packages/cli/src/task-runners/task-broker/task-broker.service.ts b/packages/cli/src/task-runners/task-broker/task-broker.service.ts index 3d59ccb02a..67df04d4ef 100644 --- a/packages/cli/src/task-runners/task-broker/task-broker.service.ts +++ b/packages/cli/src/task-runners/task-broker/task-broker.service.ts @@ -1,3 +1,4 @@ +import { Logger } from '@n8n/backend-common'; import { TaskRunnersConfig } from '@n8n/config'; import { Service } from '@n8n/di'; import type { @@ -6,7 +7,6 @@ import type { RunnerMessage, TaskResultData, } from '@n8n/task-runner'; -import { Logger } from 'n8n-core'; import { UnexpectedError, UserError } from 'n8n-workflow'; import { nanoid } from 'nanoid'; diff --git a/packages/cli/src/task-runners/task-runner-module.ts b/packages/cli/src/task-runners/task-runner-module.ts index 535eceb649..d01c3c9515 100644 --- a/packages/cli/src/task-runners/task-runner-module.ts +++ b/packages/cli/src/task-runners/task-runner-module.ts @@ -1,7 +1,8 @@ +import { Logger } from '@n8n/backend-common'; import { TaskRunnersConfig } from '@n8n/config'; import { OnShutdown } from '@n8n/decorators'; import { Container, Service } from '@n8n/di'; -import { ErrorReporter, Logger } from 'n8n-core'; +import { ErrorReporter } from 'n8n-core'; import { sleep } from 'n8n-workflow'; import * as a from 'node:assert/strict'; diff --git a/packages/cli/src/task-runners/task-runner-process.ts b/packages/cli/src/task-runners/task-runner-process.ts index 63506bafb0..6854636b6c 100644 --- a/packages/cli/src/task-runners/task-runner-process.ts +++ b/packages/cli/src/task-runners/task-runner-process.ts @@ -1,7 +1,7 @@ +import { Logger } from '@n8n/backend-common'; import { TaskRunnersConfig } from '@n8n/config'; import { OnShutdown } from '@n8n/decorators'; import { Service } from '@n8n/di'; -import { Logger } from 'n8n-core'; import * as a from 'node:assert/strict'; import { spawn } from 'node:child_process'; import * as process from 'node:process'; diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts index 1cd0dc876d..2979c40cf7 100644 --- a/packages/cli/src/telemetry/index.ts +++ b/packages/cli/src/telemetry/index.ts @@ -1,3 +1,4 @@ +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { ProjectRelationRepository, @@ -9,7 +10,7 @@ import { OnShutdown } from '@n8n/decorators'; import { Container, Service } from '@n8n/di'; import type RudderStack from '@rudderstack/rudder-sdk-node'; import axios from 'axios'; -import { InstanceSettings, Logger } from 'n8n-core'; +import { InstanceSettings } from 'n8n-core'; import type { ITelemetryTrackProperties } from 'n8n-workflow'; import { LOWEST_SHUTDOWN_PRIORITY, N8N_VERSION } from '@/constants'; diff --git a/packages/cli/src/user-management/email/node-mailer.ts b/packages/cli/src/user-management/email/node-mailer.ts index ac555155d2..16ab41546e 100644 --- a/packages/cli/src/user-management/email/node-mailer.ts +++ b/packages/cli/src/user-management/email/node-mailer.ts @@ -1,7 +1,8 @@ +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { Service } from '@n8n/di'; import { pick } from 'lodash'; -import { ErrorReporter, Logger } from 'n8n-core'; +import { ErrorReporter } from 'n8n-core'; import path from 'node:path'; import type { Transporter } from 'nodemailer'; import { createTransport } from 'nodemailer'; diff --git a/packages/cli/src/user-management/email/user-management-mailer.ts b/packages/cli/src/user-management/email/user-management-mailer.ts index d5e3cc3f8a..8f8e177b51 100644 --- a/packages/cli/src/user-management/email/user-management-mailer.ts +++ b/packages/cli/src/user-management/email/user-management-mailer.ts @@ -1,4 +1,4 @@ -import { inTest } from '@n8n/backend-common'; +import { inTest, Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import type { User } from '@n8n/db'; import { UserRepository } from '@n8n/db'; @@ -6,7 +6,6 @@ import { Container, Service } from '@n8n/di'; import { existsSync } from 'fs'; import { readFile } from 'fs/promises'; import Handlebars from 'handlebars'; -import { Logger } from 'n8n-core'; import type { IWorkflowBase } from 'n8n-workflow'; import { join as pathJoin } from 'path'; diff --git a/packages/cli/src/utils/strapi-utils.ts b/packages/cli/src/utils/strapi-utils.ts index aaf2e2d281..72eb39fdc2 100644 --- a/packages/cli/src/utils/strapi-utils.ts +++ b/packages/cli/src/utils/strapi-utils.ts @@ -1,6 +1,7 @@ +import { Logger } from '@n8n/backend-common'; import { Container } from '@n8n/di'; import axios from 'axios'; -import { ErrorReporter, Logger } from 'n8n-core'; +import { ErrorReporter } from 'n8n-core'; interface ResponseData { data: Array>; diff --git a/packages/cli/src/wait-tracker.ts b/packages/cli/src/wait-tracker.ts index 7c738fe940..4f5e772a83 100644 --- a/packages/cli/src/wait-tracker.ts +++ b/packages/cli/src/wait-tracker.ts @@ -1,7 +1,8 @@ +import { Logger } from '@n8n/backend-common'; import { ExecutionRepository } from '@n8n/db'; import { OnLeaderStepdown, OnLeaderTakeover } from '@n8n/decorators'; import { Service } from '@n8n/di'; -import { InstanceSettings, Logger } from 'n8n-core'; +import { InstanceSettings } from 'n8n-core'; import { UnexpectedError, type IWorkflowExecutionDataProcess } from 'n8n-workflow'; import { ActiveExecutions } from '@/active-executions'; diff --git a/packages/cli/src/webhooks/__tests__/webhook-helpers.test.ts b/packages/cli/src/webhooks/__tests__/webhook-helpers.test.ts index 0298a3d4c7..39d770bb6f 100644 --- a/packages/cli/src/webhooks/__tests__/webhook-helpers.test.ts +++ b/packages/cli/src/webhooks/__tests__/webhook-helpers.test.ts @@ -1,6 +1,7 @@ +import { Logger } from '@n8n/backend-common'; import type express from 'express'; import { mock, type MockProxy } from 'jest-mock-extended'; -import { BinaryDataService, ErrorReporter, Logger } from 'n8n-core'; +import { BinaryDataService, ErrorReporter } from 'n8n-core'; import type { Workflow, INode, diff --git a/packages/cli/src/webhooks/live-webhooks.ts b/packages/cli/src/webhooks/live-webhooks.ts index 58a574856d..4e2fd62d60 100644 --- a/packages/cli/src/webhooks/live-webhooks.ts +++ b/packages/cli/src/webhooks/live-webhooks.ts @@ -1,7 +1,7 @@ +import { Logger } from '@n8n/backend-common'; import { WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import type { Response } from 'express'; -import { Logger } from 'n8n-core'; import { Workflow, CHAT_TRIGGER_NODE_TYPE } from 'n8n-workflow'; import type { INode, IWebhookData, IHttpRequestMethods } from 'n8n-workflow'; diff --git a/packages/cli/src/webhooks/waiting-webhooks.ts b/packages/cli/src/webhooks/waiting-webhooks.ts index 75a2815a07..29621332eb 100644 --- a/packages/cli/src/webhooks/waiting-webhooks.ts +++ b/packages/cli/src/webhooks/waiting-webhooks.ts @@ -1,8 +1,8 @@ +import { Logger } from '@n8n/backend-common'; import type { IExecutionResponse } from '@n8n/db'; import { ExecutionRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import type express from 'express'; -import { Logger } from 'n8n-core'; import { FORM_NODE_TYPE, type INodes, diff --git a/packages/cli/src/webhooks/webhook-helpers.ts b/packages/cli/src/webhooks/webhook-helpers.ts index 7a52f5534a..9cf26ebce2 100644 --- a/packages/cli/src/webhooks/webhook-helpers.ts +++ b/packages/cli/src/webhooks/webhook-helpers.ts @@ -6,12 +6,13 @@ /* eslint-disable prefer-spread */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/restrict-template-expressions */ +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import type { Project } from '@n8n/db'; import { Container } from '@n8n/di'; import type express from 'express'; import get from 'lodash/get'; -import { BinaryDataService, ErrorReporter, Logger } from 'n8n-core'; +import { BinaryDataService, ErrorReporter } from 'n8n-core'; import type { IBinaryData, IBinaryKeyData, diff --git a/packages/cli/src/webhooks/webhook-request-handler.ts b/packages/cli/src/webhooks/webhook-request-handler.ts index 936536498b..18d659a26d 100644 --- a/packages/cli/src/webhooks/webhook-request-handler.ts +++ b/packages/cli/src/webhooks/webhook-request-handler.ts @@ -1,6 +1,6 @@ +import { Logger } from '@n8n/backend-common'; import { Container } from '@n8n/di'; import type express from 'express'; -import { Logger } from 'n8n-core'; import { ensureError, type IHttpRequestMethods } from 'n8n-workflow'; import { WebhookNotFoundError } from '@/errors/response-errors/webhook-not-found.error'; diff --git a/packages/cli/src/webhooks/webhook.service.ts b/packages/cli/src/webhooks/webhook.service.ts index 79d0db910d..490ae186d3 100644 --- a/packages/cli/src/webhooks/webhook.service.ts +++ b/packages/cli/src/webhooks/webhook.service.ts @@ -1,7 +1,8 @@ +import { Logger } from '@n8n/backend-common'; import type { WebhookEntity } from '@n8n/db'; import { WebhookRepository } from '@n8n/db'; import { Service } from '@n8n/di'; -import { HookContext, WebhookContext, Logger } from 'n8n-core'; +import { HookContext, WebhookContext } from 'n8n-core'; import { Node, NodeHelpers, UnexpectedError } from 'n8n-workflow'; import type { IHttpRequestMethods, diff --git a/packages/cli/src/workflow-execute-additional-data.ts b/packages/cli/src/workflow-execute-additional-data.ts index c9e2a73e80..16f06a1f34 100644 --- a/packages/cli/src/workflow-execute-additional-data.ts +++ b/packages/cli/src/workflow-execute-additional-data.ts @@ -3,10 +3,11 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ import type { PushMessage, PushType } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { ExecutionRepository, WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; -import { Logger, WorkflowExecute } from 'n8n-core'; +import { WorkflowExecute } from 'n8n-core'; import { UnexpectedError, Workflow } from 'n8n-workflow'; import type { IDataObject, diff --git a/packages/cli/src/workflow-runner.ts b/packages/cli/src/workflow-runner.ts index f60542465d..ef14b49746 100644 --- a/packages/cli/src/workflow-runner.ts +++ b/packages/cli/src/workflow-runner.ts @@ -2,10 +2,11 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-shadow */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ +import { Logger } from '@n8n/backend-common'; import { ExecutionRepository } from '@n8n/db'; import { Container, Service } from '@n8n/di'; import type { ExecutionLifecycleHooks } from 'n8n-core'; -import { ErrorReporter, InstanceSettings, Logger, WorkflowExecute } from 'n8n-core'; +import { ErrorReporter, InstanceSettings, WorkflowExecute } from 'n8n-core'; import type { ExecutionError, IDeferredPromise, diff --git a/packages/cli/src/workflows/workflow-execution.service.ts b/packages/cli/src/workflows/workflow-execution.service.ts index b6b486149c..59a34665ef 100644 --- a/packages/cli/src/workflows/workflow-execution.service.ts +++ b/packages/cli/src/workflows/workflow-execution.service.ts @@ -1,8 +1,9 @@ +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import type { Project, User, CreateExecutionPayload } from '@n8n/db'; import { ExecutionRepository, WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; -import { ErrorReporter, Logger } from 'n8n-core'; +import { ErrorReporter } from 'n8n-core'; import type { IDeferredPromise, IExecuteData, diff --git a/packages/cli/src/workflows/workflow-history.ee/workflow-history.service.ee.ts b/packages/cli/src/workflows/workflow-history.ee/workflow-history.service.ee.ts index e1b12b22ab..2c59bac183 100644 --- a/packages/cli/src/workflows/workflow-history.ee/workflow-history.service.ee.ts +++ b/packages/cli/src/workflows/workflow-history.ee/workflow-history.service.ee.ts @@ -1,7 +1,7 @@ +import { Logger } from '@n8n/backend-common'; import type { User, WorkflowHistory } from '@n8n/db'; import { WorkflowHistoryRepository } from '@n8n/db'; import { Service } from '@n8n/di'; -import { Logger } from 'n8n-core'; import type { IWorkflowBase } from 'n8n-workflow'; import { ensureError } from 'n8n-workflow'; diff --git a/packages/cli/src/workflows/workflow-static-data.service.ts b/packages/cli/src/workflows/workflow-static-data.service.ts index fb59827bdc..0c20a45552 100644 --- a/packages/cli/src/workflows/workflow-static-data.service.ts +++ b/packages/cli/src/workflows/workflow-static-data.service.ts @@ -1,7 +1,8 @@ +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import { WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; -import { ErrorReporter, Logger } from 'n8n-core'; +import { ErrorReporter } from 'n8n-core'; import type { IDataObject, Workflow } from 'n8n-workflow'; import { isWorkflowIdValid } from '@/utils'; diff --git a/packages/cli/src/workflows/workflow.service.ee.ts b/packages/cli/src/workflows/workflow.service.ee.ts index 924cf1e465..b0bcd5ad66 100644 --- a/packages/cli/src/workflows/workflow.service.ee.ts +++ b/packages/cli/src/workflows/workflow.service.ee.ts @@ -1,3 +1,4 @@ +import { Logger } from '@n8n/backend-common'; import type { CredentialsEntity, CredentialUsedByWorkflow, @@ -19,7 +20,6 @@ import { Service } from '@n8n/di'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import import { In, type EntityManager } from '@n8n/typeorm'; import omit from 'lodash/omit'; -import { Logger } from 'n8n-core'; import type { IWorkflowBase, WorkflowId } from 'n8n-workflow'; import { NodeOperationError, PROJECT_ROOT, UserError, WorkflowActivationError } from 'n8n-workflow'; diff --git a/packages/cli/src/workflows/workflow.service.ts b/packages/cli/src/workflows/workflow.service.ts index 2086af62d6..1a8aead54f 100644 --- a/packages/cli/src/workflows/workflow.service.ts +++ b/packages/cli/src/workflows/workflow.service.ts @@ -1,3 +1,4 @@ +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import type { User, WorkflowEntity, ListQueryDb, WorkflowFolderUnionFull } from '@n8n/db'; import { @@ -17,7 +18,7 @@ import { In } from '@n8n/typeorm'; import type { QueryDeepPartialEntity } from '@n8n/typeorm/query-builder/QueryPartialEntity'; import omit from 'lodash/omit'; import pick from 'lodash/pick'; -import { BinaryDataService, Logger } from 'n8n-core'; +import { BinaryDataService } from 'n8n-core'; import { NodeApiError, PROJECT_ROOT } from 'n8n-workflow'; import { v4 as uuid } from 'uuid'; diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts index c9a130660d..c7877a0daa 100644 --- a/packages/cli/src/workflows/workflows.controller.ts +++ b/packages/cli/src/workflows/workflows.controller.ts @@ -3,6 +3,7 @@ import { ManualRunQueryDto, TransferWorkflowBodyDto, } from '@n8n/api-types'; +import { Logger } from '@n8n/backend-common'; import { GlobalConfig } from '@n8n/config'; import type { Project } from '@n8n/db'; import { @@ -31,7 +32,6 @@ import { import { In, type FindOptionsRelations } from '@n8n/typeorm'; import axios from 'axios'; import express from 'express'; -import { Logger } from 'n8n-core'; import { UnexpectedError } from 'n8n-workflow'; import { v4 as uuid } from 'uuid'; diff --git a/packages/cli/test/shared/mocking.ts b/packages/cli/test/shared/mocking.ts index 1fbd0767d8..e85563f152 100644 --- a/packages/cli/test/shared/mocking.ts +++ b/packages/cli/test/shared/mocking.ts @@ -1,7 +1,8 @@ +import type { Logger } from '@n8n/backend-common'; import { Container } from '@n8n/di'; import { DataSource, EntityManager, type EntityMetadata } from '@n8n/typeorm'; import { mock } from 'jest-mock-extended'; -import type { Cipher, Class, Logger } from 'n8n-core'; +import type { Cipher, Class } from 'n8n-core'; import type { DeepPartial } from 'ts-essentials'; export const mockInstance = ( diff --git a/packages/core/src/binary-data/object-store/object-store.service.ee.ts b/packages/core/src/binary-data/object-store/object-store.service.ee.ts index 408d420e6f..6c44d95811 100644 --- a/packages/core/src/binary-data/object-store/object-store.service.ee.ts +++ b/packages/core/src/binary-data/object-store/object-store.service.ee.ts @@ -14,13 +14,12 @@ import { DeleteObjectsCommand, ListObjectsV2Command, } from '@aws-sdk/client-s3'; +import { Logger } from '@n8n/backend-common'; import { Service } from '@n8n/di'; import { UnexpectedError } from 'n8n-workflow'; import { createHash } from 'node:crypto'; import { Readable } from 'node:stream'; -import { Logger } from '@/logging/logger'; - import { ObjectStoreConfig } from './object-store.config'; import type { MetadataResponseHeaders } from './types'; import type { BinaryData } from '../types'; diff --git a/packages/core/src/errors/__tests__/error-reporter.test.ts b/packages/core/src/errors/__tests__/error-reporter.test.ts index 33ff6ea04d..cc35d69e88 100644 --- a/packages/core/src/errors/__tests__/error-reporter.test.ts +++ b/packages/core/src/errors/__tests__/error-reporter.test.ts @@ -1,11 +1,10 @@ +import type { Logger } from '@n8n/backend-common'; import { QueryFailedError } from '@n8n/typeorm'; import type { ErrorEvent } from '@sentry/types'; import { AxiosError } from 'axios'; import { mock } from 'jest-mock-extended'; import { ApplicationError, BaseError } from 'n8n-workflow'; -import type { Logger } from '@/logging/logger'; - import { ErrorReporter } from '../error-reporter'; jest.mock('@sentry/node', () => ({ diff --git a/packages/core/src/errors/error-reporter.ts b/packages/core/src/errors/error-reporter.ts index 488ef5f3b3..9f5a76ae9a 100644 --- a/packages/core/src/errors/error-reporter.ts +++ b/packages/core/src/errors/error-reporter.ts @@ -1,3 +1,4 @@ +import { Logger } from '@n8n/backend-common'; import { Service } from '@n8n/di'; import type { NodeOptions } from '@sentry/node'; import { close } from '@sentry/node'; @@ -8,7 +9,6 @@ import { ApplicationError, ExecutionCancelledError, BaseError } from 'n8n-workfl import { createHash } from 'node:crypto'; import type { InstanceType } from '@/instance-settings'; -import { Logger } from '@/logging/logger'; type ErrorReporterInitOptions = { serverType: InstanceType | 'task_runner'; diff --git a/packages/core/src/execution-engine/active-workflows.ts b/packages/core/src/execution-engine/active-workflows.ts index b62f49628b..2f4db747bb 100644 --- a/packages/core/src/execution-engine/active-workflows.ts +++ b/packages/core/src/execution-engine/active-workflows.ts @@ -1,3 +1,4 @@ +import { Logger } from '@n8n/backend-common'; import { Service } from '@n8n/di'; import type { INode, @@ -18,7 +19,6 @@ import { import { ErrorReporter } from '@/errors/error-reporter'; import type { IWorkflowData } from '@/interfaces'; -import { Logger } from '@/logging/logger'; import type { IGetExecutePollFunctions, IGetExecuteTriggerFunctions } from './interfaces'; import { ScheduledTaskManager } from './scheduled-task-manager'; diff --git a/packages/core/src/execution-engine/node-execution-context/credentials-test-context.ts b/packages/core/src/execution-engine/node-execution-context/credentials-test-context.ts index 75b05fb790..50352edb0a 100644 --- a/packages/core/src/execution-engine/node-execution-context/credentials-test-context.ts +++ b/packages/core/src/execution-engine/node-execution-context/credentials-test-context.ts @@ -1,9 +1,8 @@ +import { Logger } from '@n8n/backend-common'; import { Memoized } from '@n8n/decorators'; import { Container } from '@n8n/di'; import type { ICredentialTestFunctions } from 'n8n-workflow'; -import { Logger } from '@/logging'; - import { proxyRequestToAxios } from './utils/request-helper-functions'; import { getSSHTunnelFunctions } from './utils/ssh-tunnel-helper-functions'; diff --git a/packages/core/src/execution-engine/node-execution-context/node-execution-context.ts b/packages/core/src/execution-engine/node-execution-context/node-execution-context.ts index 17047b30b2..328856e8b0 100644 --- a/packages/core/src/execution-engine/node-execution-context/node-execution-context.ts +++ b/packages/core/src/execution-engine/node-execution-context/node-execution-context.ts @@ -1,3 +1,4 @@ +import { Logger } from '@n8n/backend-common'; import { Memoized } from '@n8n/decorators'; import { Container } from '@n8n/di'; import { get } from 'lodash'; @@ -35,7 +36,6 @@ import { HTTP_REQUEST_TOOL_NODE_TYPE, } from '@/constants'; import { InstanceSettings } from '@/instance-settings'; -import { Logger } from '@/logging/logger'; import { cleanupParameterData } from './utils/cleanup-parameter-data'; import { ensureType } from './utils/ensure-type'; diff --git a/packages/core/src/execution-engine/node-execution-context/utils/request-helper-functions.ts b/packages/core/src/execution-engine/node-execution-context/utils/request-helper-functions.ts index 04657029a9..366d8571ef 100644 --- a/packages/core/src/execution-engine/node-execution-context/utils/request-helper-functions.ts +++ b/packages/core/src/execution-engine/node-execution-context/utils/request-helper-functions.ts @@ -6,6 +6,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-shadow */ +import { Logger } from '@n8n/backend-common'; import type { ClientOAuth2Options, ClientOAuth2RequestObject, @@ -65,7 +66,6 @@ import { Readable } from 'stream'; import url, { URL, URLSearchParams } from 'url'; import type { IResponseError } from '@/interfaces'; -import { Logger } from '@/logging/logger'; import { binaryToString } from './binary-helper-functions'; import { parseIncomingMessage } from './parse-incoming-message'; diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 08bf331a82..19ff684dd0 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -8,7 +8,6 @@ export * from './encryption'; export * from './errors'; export * from './execution-engine'; export * from './instance-settings'; -export * from './logging'; export * from './nodes-loader'; export * from './utils'; export { WorkflowHasIssuesError } from './errors/workflow-has-issues.error'; diff --git a/packages/core/src/instance-settings/__tests__/instance-settings.test.ts b/packages/core/src/instance-settings/__tests__/instance-settings.test.ts index 15afaee6df..6c7418001c 100644 --- a/packages/core/src/instance-settings/__tests__/instance-settings.test.ts +++ b/packages/core/src/instance-settings/__tests__/instance-settings.test.ts @@ -1,10 +1,9 @@ +import type { Logger } from '@n8n/backend-common'; import { InstanceSettingsConfig } from '@n8n/config'; import { mock } from 'jest-mock-extended'; jest.mock('node:fs', () => mock()); import * as fs from 'node:fs'; -import type { Logger } from '@/logging/logger'; - import { InstanceSettings } from '../instance-settings'; import { WorkerMissingEncryptionKey } from '../worker-missing-encryption-key.error'; diff --git a/packages/core/src/instance-settings/instance-settings.ts b/packages/core/src/instance-settings/instance-settings.ts index 2322ec19ae..5761e3902d 100644 --- a/packages/core/src/instance-settings/instance-settings.ts +++ b/packages/core/src/instance-settings/instance-settings.ts @@ -1,4 +1,4 @@ -import { inTest } from '@n8n/backend-common'; +import { inTest, Logger } from '@n8n/backend-common'; import { InstanceSettingsConfig } from '@n8n/config'; import { Memoized } from '@n8n/decorators'; import { Service } from '@n8n/di'; @@ -8,8 +8,6 @@ import { customAlphabet } from 'nanoid'; import { chmodSync, existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'node:fs'; import path from 'path'; -import { Logger } from '@/logging/logger'; - import { WorkerMissingEncryptionKey } from './worker-missing-encryption-key.error'; const nanoid = customAlphabet(ALPHABET, 16); diff --git a/packages/core/src/nodes-loader/directory-loader.ts b/packages/core/src/nodes-loader/directory-loader.ts index cb67b47aea..3e5353d443 100644 --- a/packages/core/src/nodes-loader/directory-loader.ts +++ b/packages/core/src/nodes-loader/directory-loader.ts @@ -1,3 +1,4 @@ +import { Logger } from '@n8n/backend-common'; import { Container } from '@n8n/di'; import uniqBy from 'lodash/uniqBy'; import type { @@ -20,7 +21,6 @@ import * as path from 'path'; import { UnrecognizedCredentialTypeError } from '@/errors/unrecognized-credential-type.error'; import { UnrecognizedNodeTypeError } from '@/errors/unrecognized-node-type.error'; -import { Logger } from '@/logging/logger'; import { commonCORSParameters, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 91232c8318..ab9df2d13f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -394,18 +394,30 @@ importers: packages/@n8n/backend-common: dependencies: + '@n8n/config': + specifier: workspace:^ + version: link:../config '@n8n/constants': specifier: workspace:^ version: link:../constants '@n8n/di': specifier: workspace:^ version: link:../di + callsites: + specifier: 'catalog:' + version: 3.1.0 n8n-workflow: specifier: workspace:^ version: link:../../workflow + picocolors: + specifier: 'catalog:' + version: 1.0.1 reflect-metadata: specifier: 'catalog:' version: 0.2.2 + winston: + specifier: 3.14.2 + version: 3.14.2 devDependencies: '@n8n/typescript-config': specifier: workspace:* @@ -22286,7 +22298,7 @@ snapshots: eslint-import-resolver-node@0.3.9: dependencies: - debug: 3.2.7(supports-color@5.5.0) + debug: 3.2.7(supports-color@8.1.1) is-core-module: 2.13.1 resolve: 1.22.8 transitivePeerDependencies: @@ -22311,7 +22323,7 @@ snapshots: eslint-module-utils@2.8.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.8.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0): dependencies: - debug: 3.2.7(supports-color@5.5.0) + debug: 3.2.7(supports-color@8.1.1) optionalDependencies: '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.8.2) eslint: 8.57.0 @@ -22331,7 +22343,7 @@ snapshots: array.prototype.findlastindex: 1.2.3 array.prototype.flat: 1.3.2 array.prototype.flatmap: 1.3.2 - debug: 3.2.7(supports-color@5.5.0) + debug: 3.2.7(supports-color@8.1.1) doctrine: 2.1.0 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 @@ -23161,7 +23173,7 @@ snapshots: array-parallel: 0.1.3 array-series: 0.1.5 cross-spawn: 7.0.6 - debug: 3.2.7(supports-color@5.5.0) + debug: 3.2.7(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -26077,7 +26089,7 @@ snapshots: pdf-parse@1.1.1: dependencies: - debug: 3.2.7(supports-color@5.5.0) + debug: 3.2.7(supports-color@8.1.1) node-ensure: 0.0.0 transitivePeerDependencies: - supports-color @@ -26916,7 +26928,7 @@ snapshots: rhea@1.0.24: dependencies: - debug: 3.2.7(supports-color@5.5.0) + debug: 3.2.7(supports-color@8.1.1) transitivePeerDependencies: - supports-color