🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor
Edward Cui6ec3def80e72
diff --git a/server/src/api/sites/importSiteData.ts b/server/src/api/sites/importSiteData.tsindex c555a20a2..2500b0d51 100644--- a/server/src/api/sites/importSiteData.ts+++ b/server/src/api/sites/importSiteData.ts@@ -7,7 +7,7 @@ import { FastifyRequest, FastifyReply } from "fastify";import { DateTime } from "luxon";import { z } from "zod";import { getUserHasAdminAccessToSite } from "../../lib/auth-utils.js";-import { getJobQueue } from "../../queues/jobQueueFactory.js";+import { getJobQueue } from "../../services/import/queues/jobQueueFactory.js";import { ImportLimiter } from "../../services/import/importLimiter.js";import { updateImportStatus } from "../../services/import/importStatusManager.js";import { deleteImportFile, getImportStorageLocation } from "../../services/import/utils.js";diff --git a/server/src/index.ts b/server/src/index.tsindex 5a5c9f898..fd27f3c08 100644--- a/server/src/index.ts+++ b/server/src/index.ts@@ -83,7 +83,7 @@ import { getSitePrivateLinkConfig } from "./api/sites/getSitePrivateLinkConfig.jimport { getSiteImports } from "./api/sites/getSiteImports.js";import { importSiteData } from "./api/sites/importSiteData.js";import { deleteSiteImport } from "./api/sites/deleteSiteImport.js";-import { getJobQueue } from "./queues/jobQueueFactory.js";+import { getJobQueue } from "./services/import/queues/jobQueueFactory.js";const __filename = fileURLToPath(import.meta.url);const __dirname = dirname(__filename);diff --git a/server/src/queues/adapters/bullMQAdapter.ts b/server/src/services/import/queues/adapters/bullMQAdapter.tssimilarity index 95%rename from server/src/queues/adapters/bullMQAdapter.tsrename to server/src/services/import/queues/adapters/bullMQAdapter.tsindex 0372ba0e3..4eda5c2f6 100644--- a/server/src/queues/adapters/bullMQAdapter.ts+++ b/server/src/services/import/queues/adapters/bullMQAdapter.ts@@ -1,8 +1,8 @@import { Job, Queue, QueueEvents, Worker } from "bullmq";import { IJobQueue } from "../jobQueue.js";-import { CSV_PARSE_QUEUE, DATA_INSERT_QUEUE } from "../../services/import/workers/jobs.js";-import { createCsvParseWorker } from "../../services/import/workers/csvParseWorker.js";-import { createDataInsertWorker } from "../../services/import/workers/dataInsertWorker.js";+import { CSV_PARSE_QUEUE, DATA_INSERT_QUEUE } from "../../workers/jobs.js";+import { createCsvParseWorker } from "../../workers/csvParseWorker.js";+import { createDataInsertWorker } from "../../workers/dataInsertWorker.js";export class BullMQAdapter implements IJobQueue {private readonly connection: { host: string; port: number; password?: string };diff --git a/server/src/queues/adapters/pgBossAdapter.ts b/server/src/services/import/queues/adapters/pgBossAdapter.tssimilarity index 87%rename from server/src/queues/adapters/pgBossAdapter.tsrename to server/src/services/import/queues/adapters/pgBossAdapter.tsindex 125493eb4..335159abb 100644--- a/server/src/queues/adapters/pgBossAdapter.ts+++ b/server/src/services/import/queues/adapters/pgBossAdapter.ts@@ -1,8 +1,8 @@import PgBoss, { Job } from "pg-boss";import { IJobQueue } from "../jobQueue.js";-import { CSV_PARSE_QUEUE, DATA_INSERT_QUEUE } from "../../services/import/workers/jobs.js";-import { createCsvParseWorker } from "../../services/import/workers/csvParseWorker.js";-import { createDataInsertWorker } from "../../services/import/workers/dataInsertWorker.js";+import { CSV_PARSE_QUEUE, DATA_INSERT_QUEUE } from "../../workers/jobs.js";+import { createCsvParseWorker } from "../../workers/csvParseWorker.js";+import { createDataInsertWorker } from "../../workers/dataInsertWorker.js";export class PgBossAdapter implements IJobQueue {private boss: PgBoss;diff --git a/server/src/queues/jobQueue.ts b/server/src/services/import/queues/jobQueue.tssimilarity index 100%rename from server/src/queues/jobQueue.tsrename to server/src/services/import/queues/jobQueue.tsdiff --git a/server/src/queues/jobQueueFactory.ts b/server/src/services/import/queues/jobQueueFactory.tssimilarity index 93%rename from server/src/queues/jobQueueFactory.tsrename to server/src/services/import/queues/jobQueueFactory.tsindex 128f8df05..4740eb09c 100644--- a/server/src/queues/jobQueueFactory.ts+++ b/server/src/services/import/queues/jobQueueFactory.ts@@ -1,4 +1,4 @@-import { IS_CLOUD } from "../lib/const.js";+import { IS_CLOUD } from "../../../lib/const.js";import { IJobQueue } from "./jobQueue.js";import { PgBossAdapter } from "./adapters/pgBossAdapter.js";import { BullMQAdapter } from "./adapters/bullMQAdapter.js";diff --git a/server/src/services/import/workers/csvParseWorker.ts b/server/src/services/import/workers/csvParseWorker.tsindex 301ab99da..7abe97dcf 100644--- a/server/src/services/import/workers/csvParseWorker.ts+++ b/server/src/services/import/workers/csvParseWorker.ts@@ -2,7 +2,7 @@ import { access, constants } from "node:fs/promises";import { createReadStream } from "node:fs";import { parse } from "@fast-csv/parse";import { DateTime } from "luxon";-import { IJobQueue } from "../../../queues/jobQueue.js";+import { IJobQueue } from "../queues/jobQueue.js";import { r2Storage } from "../../storage/r2StorageService.js";import { CSV_PARSE_QUEUE, CsvParseJob, DATA_INSERT_QUEUE, DataInsertJob } from "./jobs.js";import { UmamiEvent, umamiHeaders } from "../mappings/umami.js";diff --git a/server/src/services/import/workers/dataInsertWorker.ts b/server/src/services/import/workers/dataInsertWorker.tsindex f045d4ea8..8155f3434 100644--- a/server/src/services/import/workers/dataInsertWorker.ts+++ b/server/src/services/import/workers/dataInsertWorker.ts@@ -1,4 +1,4 @@-import { IJobQueue } from "../../../queues/jobQueue.js";+import { IJobQueue } from "../queues/jobQueue.js";import { UmamiImportMapper } from "../mappings/umami.js";import { DataInsertJob, DATA_INSERT_QUEUE } from "./jobs.js";import { clickhouse } from "../../../db/clickhouse/clickhouse.js";