Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Refactor

Edward Cuicbdf65671c14
diff --git a/server/src/index.ts b/server/src/index.ts
index d6a0c2d6f..bd419a70c 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 "./workers/csvParseWorker.js";
-import { registerDataInsertWorker } from "./workers/dataInsertWorker.js";
+import { registerCsvParseWorker } from "./services/import/csvParseWorker.js";
+import { registerDataInsertWorker } from "./services/import/dataInsertWorker.js";
import { listSiteImports } from "./api/sites/listSiteImports.js";
const __filename = fileURLToPath(import.meta.url);
diff --git a/server/src/workers/csvParseWorker.ts b/server/src/services/import/csvParseWorker.ts
similarity index 95%
rename from server/src/workers/csvParseWorker.ts
rename to server/src/services/import/csvParseWorker.ts
index a5d0b686c..a900c0c60 100644
--- a/server/src/workers/csvParseWorker.ts
+++ b/server/src/services/import/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 "../../types/import.js";
import { Job } from "pg-boss";
import { UmamiEvent, umamiHeaders } from "./mappings/umami.js";
-import { ImportStatusManager } from "../services/import/importStatusManager.js";
-import { ImportLimiter } from "../services/import/importLimiter.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/workers/dataInsertWorker.ts b/server/src/services/import/dataInsertWorker.ts
similarity index 85%
rename from server/src/workers/dataInsertWorker.ts
rename to server/src/services/import/dataInsertWorker.ts
index cca1ba80f..e08224a2e 100644
--- a/server/src/workers/dataInsertWorker.ts
+++ b/server/src/services/import/dataInsertWorker.ts
@@ -1,9 +1,9 @@
-import boss from "../db/postgres/boss.js";
+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 { DataInsertJob, DATA_INSERT_QUEUE } from "../../types/import.js";
+import { clickhouse } from "../../db/clickhouse/clickhouse.js";
import { Job } from "pg-boss";
-import { ImportStatusManager } from "../services/import/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/workers/mappings/umami.ts b/server/src/services/import/mappings/umami.ts
similarity index 94%
rename from server/src/workers/mappings/umami.ts
rename to server/src/services/import/mappings/umami.ts
index 9a50f9a76..eca329432 100644
--- a/server/src/workers/mappings/umami.ts
+++ b/server/src/services/import/mappings/umami.ts
@@ -1,6 +1,6 @@
-import { ImportMapper } from "../../types/import.js";
-import { clearSelfReferrer, getAllUrlParams } from "../../services/tracker/utils.js";
-import { getChannel } from "../../services/tracker/getChannel.js";
+import { ImportMapper } from "../../../types/import.js";
+import { clearSelfReferrer, getAllUrlParams } from "../../tracker/utils.js";
+import { getChannel } from "../../tracker/getChannel.js";
export interface UmamiEvent {
website_id: string; // Ignore