🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Direct import
Edward Cui01355c9d9a9f
diff --git a/server/src/api/sites/importSiteData.ts b/server/src/api/sites/importSiteData.tsindex 8b5e42180..e1503b2b8 100644--- a/server/src/api/sites/importSiteData.ts+++ b/server/src/api/sites/importSiteData.ts@@ -1,18 +1,19 @@+import { createWriteStream } from "node:fs";+import { mkdir } from "node:fs/promises";+import { randomUUID } from "node:crypto";+import path from "node:path";+import { pipeline } from "node:stream/promises";import { FastifyRequest, FastifyReply } from "fastify";-import { pipeline } from "stream/promises";-import fs from "fs";-import path from "path";+import { DateTime } from "luxon";import { z } from "zod";-import crypto from "crypto";-import boss from "../../db/postgres/boss.js";+import { IS_CLOUD } from "../../lib/const.js";import { getUserHasAdminAccessToSite } from "../../lib/auth-utils.js";-import { CSV_PARSE_QUEUE } from "../../services/import/workers/jobs.js";-import { ImportStatusManager } from "../../services/import/importStatusManager.js";+import boss from "../../db/postgres/boss.js";import { ImportLimiter } from "../../services/import/importLimiter.js";-import { r2Storage } from "../../services/storage/r2StorageService.js";-import { IS_CLOUD } from "../../lib/const.js";-import { DateTime } from "luxon";+import { ImportStatusManager } from "../../services/import/importStatusManager.js";import { deleteImportFile } from "../../services/import/utils.js";+import { CSV_PARSE_QUEUE } from "../../services/import/workers/jobs.js";+import { r2Storage } from "../../services/storage/r2StorageService.js";const isValidDate = (date: string) => {const dt = DateTime.fromFormat(date, "yyyy-MM-dd", { zone: "utc" });@@ -101,7 +102,7 @@ export async function importSiteData(const { source, startDate, endDate } = parsedFields.data.fields;const organization = concurrentImportLimitResult.organizationId;- const importId = crypto.randomUUID();+ const importId = randomUUID();await ImportStatusManager.createImportStatus({importId,@@ -127,8 +128,8 @@ export async function importSiteData(const savedFileName = `${importId}.csv`;const tempFilePath = path.join(importDir, savedFileName);- await fs.promises.mkdir(importDir, { recursive: true });- await pipeline(data.file, fs.createWriteStream(tempFilePath));+ await mkdir(importDir, { recursive: true });+ await pipeline(data.file, createWriteStream(tempFilePath));storageLocation = tempFilePath;console.log(`[Import] File stored locally: ${tempFilePath}`);diff --git a/server/src/services/import/utils.ts b/server/src/services/import/utils.tsindex 41bb2856d..9dbb12730 100644--- a/server/src/services/import/utils.ts+++ b/server/src/services/import/utils.ts@@ -1,4 +1,4 @@-import fs from "fs";+import { unlink } from "node:fs/promises";import { r2Storage } from "../storage/r2StorageService.js";export const deleteImportFile = async (storageLocation: string, isR2Storage: boolean) => {@@ -7,7 +7,7 @@ export const deleteImportFile = async (storageLocation: string, isR2Storage: booawait r2Storage.deleteImportFile(storageLocation);console.log(`Deleted R2 import file: ${storageLocation}`);} else {- await fs.promises.unlink(storageLocation);+ await unlink(storageLocation);console.log(`Deleted local import file: ${storageLocation}`);}} catch (error) {