🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor
Edward Cuic65a81a5d8bf
diff --git a/server/src/api/sites/importSiteData.ts b/server/src/api/sites/importSiteData.tsindex 430abaa7e..cd0fed0a7 100644--- a/server/src/api/sites/importSiteData.ts+++ b/server/src/api/sites/importSiteData.ts@@ -6,7 +6,7 @@ import { z } from "zod";import crypto from "crypto";import boss from "../../db/postgres/boss.js";import { getUserHasAdminAccessToSite } from "../../lib/auth-utils.js";-import { CSV_PARSE_QUEUE } from "../../types/import.js";+import { CSV_PARSE_QUEUE } from "../../services/import/workers/jobs.js";import { ImportStatusManager } from "../../services/import/importStatusManager.js";import { ImportLimiter } from "../../services/import/importLimiter.js";diff --git a/server/src/index.ts b/server/src/index.tsindex bd419a70c..95212c998 100644--- a/server/src/index.ts+++ b/server/src/index.ts@@ -76,8 +76,8 @@ import { telemetryService } from "./services/telemetryService.js";import { extractSiteId, isSitePublic } from "./utils.js";import { importSiteData } from "./api/sites/importSiteData.js";import boss from "./db/postgres/boss.js";-import { registerCsvParseWorker } from "./services/import/csvParseWorker.js";-import { registerDataInsertWorker } from "./services/import/dataInsertWorker.js";+import { registerCsvParseWorker } from "./services/import/workers/csvParseWorker.js";+import { registerDataInsertWorker } from "./services/import/workers/dataInsertWorker.js";import { listSiteImports } from "./api/sites/listSiteImports.js";const __filename = fileURLToPath(import.meta.url);diff --git a/server/src/services/import/mappings/umami.ts b/server/src/services/import/mappings/umami.tsindex eca329432..4d98ab777 100644--- a/server/src/services/import/mappings/umami.ts+++ b/server/src/services/import/mappings/umami.ts@@ -1,4 +1,4 @@-import { ImportMapper } from "../../../types/import.js";+import { ImportMapper } from "../workers/jobs.js";import { clearSelfReferrer, getAllUrlParams } from "../../tracker/utils.js";import { getChannel } from "../../tracker/getChannel.js";diff --git a/server/src/services/import/csvParseWorker.ts b/server/src/services/import/workers/csvParseWorker.tssimilarity index 94%rename from server/src/services/import/csvParseWorker.tsrename to server/src/services/import/workers/csvParseWorker.tsindex a900c0c60..433e11785 100644--- a/server/src/services/import/csvParseWorker.ts+++ b/server/src/services/import/workers/csvParseWorker.ts@@ -1,11 +1,11 @@import fs from "fs";import { parseStream } from "@fast-csv/parse";-import boss from "../../db/postgres/boss.js";-import { CSV_PARSE_QUEUE, CsvParseJob, DATA_INSERT_QUEUE } from "../../types/import.js";+import boss from "../../../db/postgres/boss.js";+import { CSV_PARSE_QUEUE, CsvParseJob, DATA_INSERT_QUEUE } from "./jobs.js";import { Job } from "pg-boss";-import { UmamiEvent, umamiHeaders } from "./mappings/umami.js";-import { ImportStatusManager } from "./importStatusManager.js";-import { ImportLimiter } from "./importLimiter.js";+import { UmamiEvent, umamiHeaders } from "../mappings/umami.js";+import { ImportStatusManager } from "../importStatusManager.js";+import { ImportLimiter } from "../importLimiter.js";export async function registerCsvParseWorker() {await boss.work(CSV_PARSE_QUEUE, { batchSize: 1, pollingIntervalSeconds: 10 }, async ([ job ]: Job<CsvParseJob>[]) => {diff --git a/server/src/services/import/dataInsertWorker.ts b/server/src/services/import/workers/dataInsertWorker.tssimilarity index 81%rename from server/src/services/import/dataInsertWorker.tsrename to server/src/services/import/workers/dataInsertWorker.tsindex e08224a2e..8262af87c 100644--- a/server/src/services/import/dataInsertWorker.ts+++ b/server/src/services/import/workers/dataInsertWorker.ts@@ -1,9 +1,9 @@-import boss from "../../db/postgres/boss.js";-import { UmamiEvent, UmamiImportMapper } from "./mappings/umami.js";-import { DataInsertJob, DATA_INSERT_QUEUE } from "../../types/import.js";-import { clickhouse } from "../../db/clickhouse/clickhouse.js";+import boss from "../../../db/postgres/boss.js";+import { UmamiEvent, UmamiImportMapper } from "../mappings/umami.js";+import { DataInsertJob, DATA_INSERT_QUEUE } from "./jobs.js";+import { clickhouse } from "../../../db/clickhouse/clickhouse.js";import { Job } from "pg-boss";-import { ImportStatusManager } from "./importStatusManager.js";+import { ImportStatusManager } from "../importStatusManager.js";export async function registerDataInsertWorker() {await boss.work(DATA_INSERT_QUEUE, { batchSize: 1, pollingIntervalSeconds: 10 }, async ([ job ]: Job<DataInsertJob<UmamiEvent>>[]) => {diff --git a/server/src/types/import.ts b/server/src/services/import/workers/jobs.tssimilarity index 100%rename from server/src/types/import.tsrename to server/src/services/import/workers/jobs.ts